Set working directory to package's basedir in renderer.

zcbenz · zcbenz · commit 74e4029e44d1 · 2012-09-20T09:51:28.000+08:00
diff --git a/src/common/shell_switches.cc b/src/common/shell_switches.cc
@@ -43,11 +43,14 @@ const char kNoTimeout[] = "no-timeout";
 // Display no toolbar
 const char kNoToolbar[] = "no-toolbar";
 
+// Open specified url
+const char kUrl[] = "url";
+
 // Show version and quit
 const char kVersion[] = "version";
 
-// Open specified url
-const char kUrl[] = "url";
+// Set current working directory
+const char kWorkingDirectory[] = "working-directory";
 
 const char kmMain[]      = "main";
 const char kmName[]      = "name";
diff --git a/src/common/shell_switches.h b/src/common/shell_switches.h
@@ -16,8 +16,9 @@ extern const char kDeveloper[];
 extern const char kDumpRenderTree[];
 extern const char kNoTimeout[];
 extern const char kNoToolbar[];
-extern const char kVersion[];
 extern const char kUrl[];
+extern const char kVersion[];
+extern const char kWorkingDirectory[];
 
 // Manifest settings
 extern const char kmMain[];
diff --git a/src/renderer/shell_content_renderer_client.cc b/src/renderer/shell_content_renderer_client.cc
@@ -21,6 +21,8 @@
 #include "content/nw/src/renderer/shell_content_renderer_client.h"
 
 #include "base/command_line.h"
+#include "base/file_path.h"
+#include "base/file_util.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "content/nw/src/api/dispatcher.h"
@@ -45,6 +47,13 @@ ShellContentRendererClient::~ShellContentRendererClient() {
 }
 
 void ShellContentRendererClient::RenderThreadStarted() {
+  // Change working directory
+  CommandLine* command_line = CommandLine::ForCurrentProcess();
+  if (command_line->HasSwitch(switches::kWorkingDirectory)) {
+    file_util::SetCurrentDirectory(
+        command_line->GetSwitchValuePath(switches::kWorkingDirectory));
+  }
+
   // Initialize node after render thread is started
   v8::V8::Initialize();
   v8::HandleScope scope;
diff --git a/src/shell_content_browser_client.cc b/src/shell_content_browser_client.cc
@@ -22,6 +22,7 @@
 
 #include "base/command_line.h"
 #include "base/file_path.h"
+#include "base/file_util.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/browser/browser_url_handler.h"
 #include "content/public/browser/resource_dispatcher_host.h"
@@ -69,8 +70,15 @@ void ShellContentBrowserClient::AppendExtraCommandLineSwitches(
   command_line->AppendSwitch(switches::kAllowFileAccessFromFiles);
   command_line->AppendSwitch(switches::kDisableWebSecurity);
 
-  if (nw::GetManifest() && nw::GetUseNode())
+  if (nw::GetManifest() && nw::GetUseNode()) {
+    // Whether to disable node
     command_line->AppendSwitch(switches::kmNodejs);
+
+    // Set cwd
+    FilePath cwd;
+    file_util::GetCurrentDirectory(&cwd);
+    command_line->AppendSwitchPath(switches::kWorkingDirectory, cwd);
+  }
 }
 
 std::string ShellContentBrowserClient::GetApplicationLocale() {
