Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7977)

Unified Diff: chrome/browser/ui/startup/startup_browser_creator_impl.cc

Issue 816403003: Make callers of CommandLine use it via the base:: namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/startup/startup_browser_creator_impl.cc
diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
index 412187906a45081f5db463cdb01988c85ab4cc1d..42eedc7cb1b5a81f5e768b99f094ee8bd4c60f07 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -292,7 +292,7 @@ GURL GetWelcomePageURL() {
StartupBrowserCreatorImpl::StartupBrowserCreatorImpl(
const base::FilePath& cur_dir,
- const CommandLine& command_line,
+ const base::CommandLine& command_line,
chrome::startup::IsFirstRun is_first_run)
: cur_dir_(cur_dir),
command_line_(command_line),
@@ -303,7 +303,7 @@ StartupBrowserCreatorImpl::StartupBrowserCreatorImpl(
StartupBrowserCreatorImpl::StartupBrowserCreatorImpl(
const base::FilePath& cur_dir,
- const CommandLine& command_line,
+ const base::CommandLine& command_line,
StartupBrowserCreator* browser_creator,
chrome::startup::IsFirstRun is_first_run)
: cur_dir_(cur_dir),
@@ -616,7 +616,7 @@ bool StartupBrowserCreatorImpl::ProcessStartupURLs(
uint32 restore_behavior = SessionRestore::SYNCHRONOUS;
if (browser_defaults::kAlwaysCreateTabbedBrowserOnSessionRestore ||
- CommandLine::ForCurrentProcess()->HasSwitch(
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kCreateBrowserOnStartupForTests)) {
restore_behavior |= SessionRestore::ALWAYS_CREATE_TABBED_BROWSER;
}
@@ -803,8 +803,9 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(
browser->window()->Show();
// In kiosk mode, we want to always be fullscreen, so switch to that now.
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode) ||
- CommandLine::ForCurrentProcess()->HasSwitch(switches::kStartFullscreen))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode) ||
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kStartFullscreen))
chrome::ToggleFullscreenMode(browser);
return browser;

Powered by Google App Engine
This is Rietveld 408576698