diff options
Diffstat (limited to 'chrome/installer/gcapi')
-rw-r--r-- | chrome/installer/gcapi/gcapi.cc | 4 | ||||
-rw-r--r-- | chrome/installer/gcapi/gcapi_dll.cc | 4 | ||||
-rw-r--r-- | chrome/installer/gcapi/gcapi_test.cc | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/chrome/installer/gcapi/gcapi.cc b/chrome/installer/gcapi/gcapi.cc index f08d90f..ef3c963 100644 --- a/chrome/installer/gcapi/gcapi.cc +++ b/chrome/installer/gcapi/gcapi.cc @@ -504,7 +504,7 @@ BOOL __stdcall LaunchGoogleChrome() { } } - CommandLine chrome_command(chrome_exe_path); + base::CommandLine chrome_command(chrome_exe_path); bool ret = false; ScopedComPtr<IProcessLauncher> ipl; @@ -540,7 +540,7 @@ BOOL __stdcall LaunchGoogleChromeWithDimensions(int x, // When launching in the background, use WMI to ensure that chrome.exe is // is not our child process. This prevents it from pushing itself to // foreground. - CommandLine chrome_command(chrome_exe_path); + base::CommandLine chrome_command(chrome_exe_path); ScopedCOMInitializer com_initializer; if (!installer::WMIProcess::Launch(chrome_command.GetCommandLineString(), diff --git a/chrome/installer/gcapi/gcapi_dll.cc b/chrome/installer/gcapi/gcapi_dll.cc index cb512e4..66e9bc1 100644 --- a/chrome/installer/gcapi/gcapi_dll.cc +++ b/chrome/installer/gcapi/gcapi_dll.cc @@ -21,12 +21,12 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE instance, LPVOID reserved) { if (reason == DLL_PROCESS_ATTACH) { g_exit_manager = new base::AtExitManager(); - CommandLine::Init(0, NULL); + base::CommandLine::Init(0, NULL); logging::LoggingSettings settings; settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; logging::InitLogging(settings); } else if (reason == DLL_PROCESS_DETACH) { - CommandLine::Reset(); + base::CommandLine::Reset(); delete g_exit_manager; g_exit_manager = NULL; } diff --git a/chrome/installer/gcapi/gcapi_test.cc b/chrome/installer/gcapi/gcapi_test.cc index 4e5d0a7..be649f0 100644 --- a/chrome/installer/gcapi/gcapi_test.cc +++ b/chrome/installer/gcapi/gcapi_test.cc @@ -62,12 +62,12 @@ const char kManualLaunchTests[] = "launch-chrome"; int main(int argc, char* argv[]) { base::AtExitManager exit_manager; - CommandLine::Init(argc, argv); + base::CommandLine::Init(argc, argv); testing::InitGoogleTest(&argc, argv); RUN_ALL_TESTS(); - if (CommandLine::ForCurrentProcess()->HasSwitch(kManualLaunchTests)) { + if (base::CommandLine::ForCurrentProcess()->HasSwitch(kManualLaunchTests)) { call_dynamically(); call_statically(); printf("LaunchChrome returned %d.\n", LaunchGoogleChrome()); |