diff options
author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-21 18:28:03 +0000 |
---|---|---|
committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-21 18:28:03 +0000 |
commit | c26fccc06370bee04c4989e6c827507c82658f1b (patch) | |
tree | 0e48f2ff75daac42ffd5d5c1cc569223ff65409f /chrome/browser/browser_init.cc | |
parent | 6d4eaabdde47a488102e67035dd64fdb811f2b58 (diff) | |
download | chromium_src-c26fccc06370bee04c4989e6c827507c82658f1b.zip chromium_src-c26fccc06370bee04c4989e6c827507c82658f1b.tar.gz chromium_src-c26fccc06370bee04c4989e6c827507c82658f1b.tar.bz2 |
Retry of r26698.
R=stuartmorgan
Review URL: http://codereview.chromium.org/208047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26704 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_init.cc')
-rw-r--r-- | chrome/browser/browser_init.cc | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc index 1f0f5b1..26e6db5 100644 --- a/chrome/browser/browser_init.cc +++ b/chrome/browser/browser_init.cc @@ -443,30 +443,6 @@ bool BrowserInit::LaunchWithProfile::Launch(Profile* profile, browser = BrowserList::GetLastActive(); OpenURLsInBrowser(browser, process_startup, urls_to_open); } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(TOOLKIT_VIEWS) - // TODO(port): Remove ifdef when the Linux splash page is not needed. - const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess(); - // This can mess up UI tests, so only do it when UI tests aren't running. - if (!parsed_command_line.HasSwitch(switches::kHomePage) && - GetURLsFromCommandLine(profile_).empty()) { - Browser* browser = BrowserList::GetLastActive(); - if (browser) { - // Only show the splash page if it isn't already showing. - bool open_splash = true; - for (int i = 0; i < browser->tab_count(); ++i) { - if (browser->GetTabContentsAt(i)->GetURL().spec() == - "about:linux-splash") { - open_splash = false; - } - } - - if (open_splash) { - browser->OpenURL(GURL("about:linux-splash"), GURL(), - NEW_FOREGROUND_TAB, PageTransition::START_PAGE); - } - } - } -#endif // Check whether we are the default browser. if (process_startup && !command_line_.HasSwitch(switches::kNoDefaultBrowserCheck)) |