chrome/browser/ui/startup/startup_browser_creator_impl.cc - Issue 841163002: MacViews: Fix duplicate ShowSessionCrashBubble and ShowProfileResetBubble

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/startup/startup_browser_creator_impl.cc

Issue 841163002: MacViews: Fix duplicate ShowSessionCrashBubble and ShowProfileResetBubble (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@keybinding

Patch Set: Created 5 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

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 42eedc7cb1b5a81f5e768b99f094ee8bd4c60f07..23510ffeefe9c37757685256c37e63c11c65daf7 100644

--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc

+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc

@@ -65,7 +65,6 @@

#include "chrome/browser/ui/startup/default_browser_prompt.h"

#include "chrome/browser/ui/startup/google_api_keys_infobar_delegate.h"

#include "chrome/browser/ui/startup/obsolete_system_infobar_delegate.h"

-#include "chrome/browser/ui/startup/session_crashed_bubble.h"

#include "chrome/browser/ui/startup/session_crashed_infobar_delegate.h"

#include "chrome/browser/ui/startup/startup_browser_creator.h"

#include "chrome/browser/ui/tabs/pinned_tab_codec.h"

@@ -818,7 +817,7 @@ void StartupBrowserCreatorImpl::AddInfoBarsIfNecessary(

return;

if (HasPendingUncleanExit(browser->profile()) &&

- !ShowSessionCrashedBubble(browser)) {

+ !browser->window()->ShowSessionCrashedBubble()) {

SessionCrashedInfoBarDelegate::Create(browser);

}

« no previous file with comments | « chrome/browser/ui/startup/session_crashed_bubble.cc ('k') | chrome/browser/ui/views/frame/browser_view.h » ('j') | no next file with comments »