Thorium_Archive/thorium
1
0
Fork 0
Code Issues 207 Pull requests 3 Projects Releases 53 Packages Wiki Activity

Update startup_browser_creator_impl.cc

Browse source
This commit is contained in:
Alexander David Frick 2021-11-29 23:57:13 -06:00 committed by GitHub
parent 748188ca28
commit 237e02d21c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
chrome/browser/ui/startup/startup_browser_creator_impl.cc
View file

@ -428,7 +428,7 @@ StartupBrowserCreatorImpl::DetermineURLsAndLaunch(
tabs, behavior, restore_options, process_startup, is_post_crash_launch);
// Finally, add info bars.
AddInfoBarsIfNecessary(browser, process_startup);
AddInfoBarsIfNecessary(browser);
return result.launch_result;
}
@ -632,9 +632,7 @@ Browser* StartupBrowserCreatorImpl::RestoreOrCreateBrowser(
return browser;
}
void StartupBrowserCreatorImpl::AddInfoBarsIfNecessary(
Browser* browser,
chrome::startup::IsProcessStartup process_startup) {
void StartupBrowserCreatorImpl::AddInfoBarsIfNecessary(Browser* browser) {
if (!browser || !profile_ || browser->tab_strip_model()->count() == 0)
return;
@ -653,15 +651,24 @@ void StartupBrowserCreatorImpl::AddInfoBarsIfNecessary(
SessionCrashedBubble::ShowIfNotOffTheRecordProfile(
browser, /*skip_tab_checking=*/false);
// The below info bars are only added to the first profile which is launched.
// Other profiles might be restoring the browsing sessions asynchronously,
// so we cannot add the info bars to the focused tabs here.
//
// These info bars are not shown when the browser is being controlled by
// automated tests, so that they don't interfere with tests that assume no
// info bars.
if (process_startup == chrome::startup::IsProcessStartup::kYes &&
!command_line_.HasSwitch(switches::kTestType) && !IsAutomationEnabled()) {
if (!command_line_.HasSwitch(switches::kTestType) && !IsAutomationEnabled()) {
// The below info bars are only added to the first profile which is
// launched. Other profiles might be restoring the browsing sessions
// asynchronously, so we cannot add the info bars to the focused tabs here.
//
// We cannot use `chrome::startup::IsProcessStartup` to determine whether
// this is the first profile that launched: The browser may be started
// without a startup window (`kNoStartupWindow`), or open the profile
// picker, which means that `chrome::startup::IsProcessStartup` will already
// be `kNo` when the first browser window is opened.
static bool infobars_shown = false;
if (infobars_shown)
return;
infobars_shown = true;
content::WebContents* web_contents =
browser->tab_strip_model()->GetActiveWebContents();
DCHECK(web_contents);