| 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;
|
|
|