Bump v0.35.6

atom.gyp

@@ -4,7 +4,7 @@
     'product_name%': 'Electron',
     'company_name%': 'GitHub, Inc',
     'company_abbr%': 'github',
-    'version%': '0.35.4',
+    'version%': '0.35.6',
   },
   'includes': [
     'filenames.gypi',

atom/browser/resources/mac/Info.plist

@@ -17,9 +17,9 @@
   <key>CFBundleIconFile</key>
   <string>atom.icns</string>
   <key>CFBundleVersion</key>
-  <string>0.35.4</string>
+  <string>0.35.6</string>
   <key>CFBundleShortVersionString</key>
-  <string>0.35.4</string>
+  <string>0.35.6</string>
   <key>LSApplicationCategoryType</key>
   <string>public.app-category.developer-tools</string>
   <key>LSMinimumSystemVersion</key>

atom/browser/resources/win/atom.rc

@@ -56,8 +56,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,35,4,0
+ FILEVERSION 0,35,6,0
- PRODUCTVERSION 0,35,4,0
+ PRODUCTVERSION 0,35,6,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -74,12 +74,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "GitHub, Inc."
             VALUE "FileDescription", "Electron"
-            VALUE "FileVersion", "0.35.4"
+            VALUE "FileVersion", "0.35.6"
             VALUE "InternalName", "electron.exe"
             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
             VALUE "OriginalFilename", "electron.exe"
             VALUE "ProductName", "Electron"
-            VALUE "ProductVersion", "0.35.4"
+            VALUE "ProductVersion", "0.35.6"
             VALUE "SquirrelAwareVersion", "1"
         END
     END

atom/common/atom_version.h

@@ -7,7 +7,7 @@
 
 #define ATOM_MAJOR_VERSION 0
 #define ATOM_MINOR_VERSION 35
-#define ATOM_PATCH_VERSION 4
+#define ATOM_PATCH_VERSION 6
 
 #define ATOM_VERSION_IS_RELEASE 1
 

atom/common/platform_util_win.cc

@@ -340,13 +340,26 @@ bool MoveItemToTrash(const base::FilePath& path) {
 
   // Elevation prompt enabled for UAC protected files.  This overrides the
   // SILENT, NO_UI and NOERRORUI flags.
+
+  if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
+    // Windows 8 introduces the flag RECYCLEONDELETE and deprecates the
+    // ALLOWUNDO in favor of ADDUNDORECORD.
     if (FAILED(pfo->SetOperationFlags(FOF_NO_UI |
-                                    FOF_ALLOWUNDO |
+                                      FOFX_ADDUNDORECORD |
                                       FOF_NOERRORUI |
                                       FOF_SILENT |
                                       FOFX_SHOWELEVATIONPROMPT |
                                       FOFX_RECYCLEONDELETE)))
       return false;
+  } else {
+    // For Windows 7 and Vista, RecycleOnDelete is the default behavior.
+    if (FAILED(pfo->SetOperationFlags(FOF_NO_UI |
+                                      FOF_ALLOWUNDO |
+                                      FOF_NOERRORUI |
+                                      FOF_SILENT |
+                                      FOFX_SHOWELEVATIONPROMPT)))
+      return false;
+  }
 
   // Create an IShellItem from the supplied source path.
   base::win::ScopedComPtr<IShellItem> delete_item;

chromium_src/chrome/common/chrome_paths.h

@@ -17,7 +17,7 @@ class FilePath;
 namespace chrome {
 
 enum {
-  PATH_START = 1000,
+  PATH_START = 2000,
 
   DIR_APP = PATH_START,         // Directory where dlls and data reside.
   DIR_LOGS,                     // Directory where logs should be written.