Merge branch 'master' of https://github.com/rogerwang/node-webkit into tests

richardcypher · richardcypher · commit 717356abf59b · 2013-07-09T16:50:14.000+08:00
diff --git a/src/mac/app-Info.plist b/src/mac/app-Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.6.2</string>
+	<string>0.6.3</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>LSMinimumSystemVersion</key>
diff --git a/src/nw_package.cc b/src/nw_package.cc
@@ -367,24 +367,24 @@ bool Package::ExtractPath() {
 }
 
 bool Package::ExtractPackage(const FilePath& zip_file, FilePath* where) {
-  // Auto clean our temporary directory
-  static scoped_ptr<base::ScopedTempDir> scoped_temp_dir;
 
+  if (!scoped_temp_dir_.IsValid()) {
 #if defined(OS_WIN)
-  if (!file_util::CreateNewTempDirectory(L"nw", where)) {
+    if (!file_util::CreateNewTempDirectory(L"nw", where)) {
 #else
-  if (!file_util::CreateNewTempDirectory("nw", where)) {
+    if (!file_util::CreateNewTempDirectory("nw", where)) {
 #endif
-    ReportError("Cannot extract package",
-                "Unable to create temporary directory.");
-    return false;
-  }
-
-  scoped_temp_dir.reset(new base::ScopedTempDir());
-  if (!scoped_temp_dir->Set(*where)) {
-    ReportError("Cannot extract package",
-                "Unable to set temporary directory.");
-    return false;
+      ReportError("Cannot extract package",
+                  "Unable to create temporary directory.");
+      return false;
+    }
+    if (!scoped_temp_dir_.Set(*where)) {
+      ReportError("Cannot extract package",
+                  "Unable to set temporary directory.");
+      return false;
+    }
+  }else{
+    *where = scoped_temp_dir_.path();
   }
 
   return zip::Unzip(zip_file, *where);
diff --git a/src/nw_package.h b/src/nw_package.h
@@ -24,6 +24,7 @@
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/files/scoped_temp_dir.h"
 
 #include <string>
 
@@ -104,6 +105,9 @@ class Package {
   // Stored url for error page.
   std::string error_page_url_;
 
+  // Auto clean our temporary directory
+  base::ScopedTempDir scoped_temp_dir_;
+
   DISALLOW_COPY_AND_ASSIGN(Package);
 };
 
diff --git a/src/nw_version.h b/src/nw_version.h
@@ -23,8 +23,8 @@
 
 #define NW_MAJOR_VERSION 0
 #define NW_MINOR_VERSION 6
-#define NW_PATCH_VERSION 2
-#define NW_VERSION_IS_RELEASE 1
+#define NW_PATCH_VERSION 3
+#define NW_VERSION_IS_RELEASE 0
 
 #ifndef NW_STRINGIFY
 #define NW_STRINGIFY(n) NW_STRINGIFY_HELPER(n)
diff --git a/src/shell_browser_context.h b/src/shell_browser_context.h
@@ -77,7 +77,6 @@ class ShellBrowserContext : public BrowserContext {
   bool off_the_record_;
   bool ignore_certificate_errors_;
   nw::Package* package_;
-  base::ScopedTempDir testing_path_;
   FilePath path_;
   scoped_ptr<ShellResourceContext> resource_context_;
   scoped_refptr<ShellDownloadManagerDelegate> download_manager_delegate_;
