summaryrefslogtreecommitdiffstats
path: root/chrome/browser/app_controller_mac.mm
diff options
context:
space:
mode:
authoravi <avi@chromium.org>2014-12-22 14:50:17 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-22 22:51:05 +0000
commit3ef9ec9e43e5e5b7aca6ea935407a469d7b528cf (patch)
tree96d5759f382e635270a05013501abadf777ca0cf /chrome/browser/app_controller_mac.mm
parent1772c1ae7194b0efdbd3c65d1654902daabb1c51 (diff)
downloadchromium_src-3ef9ec9e43e5e5b7aca6ea935407a469d7b528cf.zip
chromium_src-3ef9ec9e43e5e5b7aca6ea935407a469d7b528cf.tar.gz
chromium_src-3ef9ec9e43e5e5b7aca6ea935407a469d7b528cf.tar.bz2
Make callers of CommandLine use it via the base:: namespace.
Covers chrome/app* and chrome/browser/* through e. BUG=422426 TEST=none TBR=ben@chromium.org Review URL: https://codereview.chromium.org/819133004 Cr-Commit-Position: refs/heads/master@{#309476}
Diffstat (limited to 'chrome/browser/app_controller_mac.mm')
-rw-r--r--chrome/browser/app_controller_mac.mm10
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index 32e82339..082dcca 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);