Install platform apps into a separate data directory

chrome/app/chrome_main_app_mode_mac.mm

Index: chrome/app/chrome_main_app_mode_mac.mm
diff --git a/chrome/app/chrome_main_app_mode_mac.mm b/chrome/app/chrome_main_app_mode_mac.mm
index 9d897d61ca6e6dc6e48e184e7fcefe7cd9898b3a..ae0b50399ac617ee67e19bad3962277312dcc375 100644
--- a/chrome/app/chrome_main_app_mode_mac.mm
+++ b/chrome/app/chrome_main_app_mode_mac.mm
@@ -10,11 +10,13 @@
 #include <string>  // TODO(viettrungluu): only needed for temporary hack
 
 #include "base/basictypes.h"
+#include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths_internal.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/mac/app_mode_common.h"
 
 extern "C" {
@@ -48,15 +50,19 @@ int ChromeAppModeStart(const app_mode::ChromeAppModeInfo* info) {
   base::mac::SetOverrideFrameworkBundlePath(
       chrome_versioned_path->Append(chrome::kFrameworkName));
 
-  // TODO(viettrungluu): do something intelligent with data
-  //  return ChromeMain(info->argc, info->argv);
-  // For now, a cheesy hack instead.
+  CommandLine command_line(CommandLine::NO_PROGRAM);
+  command_line.AppendSwitch(info->argv[0]);
   RAW_CHECK(info->app_mode_id.size());
-  std::string argv1(std::string("--app-id=") + info->app_mode_id);
-  std::string argv2(
-      std::string("--user-data-dir=") + info->user_data_dir.value());
-  char* argv[] = { info->argv[0],
-                   const_cast<char*>(argv1.c_str()),
-                   const_cast<char*>(argv2.c_str()) };
-  return ChromeMain(static_cast<int>(arraysize(argv)), argv);
+  command_line.AppendSwitchASCII(switches::kAppId, info->app_mode_id);
+  command_line.AppendSwitchPath(switches::kUserDataDir, info->user_data_dir);
+  // TODO(sail): Use a different flag that doesn't imply Location::LOAD for the
+  // extension.
+  command_line.AppendSwitchPath(switches::kLoadExtension, info->extension_path);
+
+  int argc = command_line.argv().size();
+  char* argv[argc];
+  for (int i = 0; i < argc; ++i)
+    argv[i] = const_cast<char*>(command_line.argv()[i].c_str());

[Robert Sesek, 2012/02/23 01:23:47]

Why do you need this const cast? Can't the array be of const char?

[sail, 2012/02/23 04:19:40]

Currently all ChromeMain and ContentMain accept (int argc, char** argv). It
would probably be a good idea to extend it to take CommandLine directly but I
think that's should be a separate change.

+
+  return ChromeMain(argc, argv);
 }