Chromium Code Reviews| 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..1413e0a3f60b935e2573a24a278c99bb8972c8d8 100644 |
| --- a/chrome/app/chrome_main_app_mode_mac.mm |
| +++ b/chrome/app/chrome_main_app_mode_mac.mm |
| @@ -15,6 +15,7 @@ |
| #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 +49,13 @@ int ChromeAppModeStart(const app_mode::ChromeAppModeInfo* info) { |
| base::mac::SetOverrideFrameworkBundlePath( |
| chrome_versioned_path->Append(chrome::kFrameworkName)); |
| - // TODO(viettrungluu): do something intelligent with data |
|
Mihai Parparita -not on Chrome
2012/02/21 20:41:02
So we're blessing this hack? It seems like we'd wa
sail
2012/02/22 23:35:33
Done.
|
| - // return ChromeMain(info->argc, info->argv); |
| - // For now, a cheesy hack instead. |
| 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()); |
| + std::string argv1("--app-id=" + info->app_mode_id); |
| + std::string argv2("--user-data-dir=" + info->user_data_dir.value()); |
| + std::string argv3("--load-extension=" + info->extension_path.value()); |
|
Mihai Parparita -not on Chrome
2012/02/21 20:41:02
Add a TODO about switching to a different flag tha
sail
2012/02/22 23:35:33
Done.
|
| char* argv[] = { info->argv[0], |
| const_cast<char*>(argv1.c_str()), |
| - const_cast<char*>(argv2.c_str()) }; |
| + const_cast<char*>(argv2.c_str()), |
| + const_cast<char*>(argv3.c_str()) }; |
| return ChromeMain(static_cast<int>(arraysize(argv)), argv); |
| } |