diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-17 01:04:44 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-17 01:04:44 +0000 |
| commit | 3b348b2e5c6ed3d97cb4f2b615273ef895b3cac8 (patch) | |
| tree | e7fb1fc862e3ab459a1138509d44d3688d5c6e9d | |
| parent | e2304b0549b35420d17819ede170d06edc339f37 (diff) | |
| download | chromium_src-3b348b2e5c6ed3d97cb4f2b615273ef895b3cac8.zip chromium_src-3b348b2e5c6ed3d97cb4f2b615273ef895b3cac8.tar.gz chromium_src-3b348b2e5c6ed3d97cb4f2b615273ef895b3cac8.tar.bz2 | |
Make testers happy.
Only show linux splash page for new windows.
May this be the end of this sad saga.
TEST=if chrome is already running, `./out/Debug/chrome test.html` doesn't open splash page
BUG=http://crbug.com/16893
Review URL: http://codereview.chromium.org/149780
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20925 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/browser_init.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc index a93bea4..00db034 100644 --- a/chrome/browser/browser_init.cc +++ b/chrome/browser/browser_init.cc @@ -441,7 +441,8 @@ bool BrowserInit::LaunchWithProfile::Launch(Profile* profile, // 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)) { + if (!parsed_command_line.HasSwitch(switches::kHomePage) && + GetURLsFromCommandLine(profile_).empty()) { Browser* browser = BrowserList::GetLastActive(); // Only show the splash page if it isn't already showing. bool open_splash = true; |