summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/browser_init.cc
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-11 16:25:18 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-11 16:25:18 +0000
commitc7f2632b7fc6916e91231006e1ae0f0fe7cb993f (patch)
tree247bc4ea0cc31df461cb7ad1f48a551966c27808 /chrome/browser/ui/browser_init.cc
parent967cbe1640bf96583e74cbd3ae4cd3a2a7cf3116 (diff)
downloadchromium_src-c7f2632b7fc6916e91231006e1ae0f0fe7cb993f.zip
chromium_src-c7f2632b7fc6916e91231006e1ae0f0fe7cb993f.tar.gz
chromium_src-c7f2632b7fc6916e91231006e1ae0f0fe7cb993f.tar.bz2
Don't show startup infobars in non-startup Browsers.
r75602 introduced a regression by adding startup infobars when restoring a session: startup infobars would be shown in each new Browser (i.e. when a user creates a new window in an existing session via ProcessSingleton). BUG=75654 TEST=Start Chrome, navigate somewhere and crash it. Start Chrome again. Note the startup infobar. Start Chrome again so that a window is created in the existing session. There should not be any startup infobars. Review URL: http://codereview.chromium.org/6665003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77820 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_init.cc')
-rw-r--r--chrome/browser/ui/browser_init.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc
index 29c7483..3d775c8 100644
--- a/chrome/browser/ui/browser_init.cc
+++ b/chrome/browser/ui/browser_init.cc
@@ -890,7 +890,8 @@ void BrowserInit::LaunchWithProfile::ProcessLaunchURLs(
browser = BrowserList::GetLastActiveWithProfile(profile_);
browser = OpenURLsInBrowser(browser, process_startup, adjust_urls);
- AddInfoBarsIfNecessary(browser);
+ if (process_startup)
+ AddInfoBarsIfNecessary(browser);
}
bool BrowserInit::LaunchWithProfile::ProcessStartupURLs(