| Index: chrome/browser/app_controller_mac.mm
|
| diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
|
| index 32e8233975fc9090c3f6da49bbadf9129ccb2845..082dccab046b169296cf157d0182ff3d5f4a63d8 100644
|
| --- a/chrome/browser/app_controller_mac.mm
|
| +++ b/chrome/browser/app_controller_mac.mm
|
| @@ -430,7 +430,7 @@ class AppControllerProfileObserver : public ProfileInfoCacheObserver {
|
| // sessions.
|
| if (!browser_shutdown::IsTryingToQuit() && quitWithAppsController_.get() &&
|
| !quitWithAppsController_->ShouldQuit()) {
|
| - if (CommandLine::ForCurrentProcess()->HasSwitch(
|
| + if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kHostedAppQuitNotification)) {
|
| return NO;
|
| }
|
| @@ -1387,9 +1387,9 @@ class AppControllerProfileObserver : public ProfileInfoCacheObserver {
|
| if (!profile_manager)
|
| return NULL;
|
|
|
| - return profile_manager->GetProfile(GetStartupProfilePath(
|
| - profile_manager->user_data_dir(),
|
| - *CommandLine::ForCurrentProcess()));
|
| + return profile_manager->GetProfile(
|
| + GetStartupProfilePath(profile_manager->user_data_dir(),
|
| + *base::CommandLine::ForCurrentProcess()));
|
| }
|
|
|
| - (Profile*)safeLastProfileForNewWindows {
|
| @@ -1429,7 +1429,7 @@ class AppControllerProfileObserver : public ProfileInfoCacheObserver {
|
| browser->window()->Show();
|
| }
|
|
|
| - CommandLine dummy(CommandLine::NO_PROGRAM);
|
| + base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
|
| chrome::startup::IsFirstRun first_run = first_run::IsChromeFirstRun() ?
|
| chrome::startup::IS_FIRST_RUN : chrome::startup::IS_NOT_FIRST_RUN;
|
| StartupBrowserCreatorImpl launch(base::FilePath(), dummy, first_run);
|
|
|