chrome/browser/ui/chrome_pages.cc - Issue 1307093004: Remove references to IsNewAvatarMenu since the flag was removed.

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/chrome_pages.cc

Issue 1307093004: Remove references to IsNewAvatarMenu since the flag was removed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address review feedback Created 5 years, 3 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

« no previous file with comments | « chrome/browser/ui/browser_command_controller_unittest.cc ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/chrome_pages.cc

diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc

index 8152d56902afdf2600bb9fd951578ede791e833a..ce6ab7c1556a4a05097725c7afefb112ad510149 100644

--- a/chrome/browser/ui/chrome_pages.cc

+++ b/chrome/browser/ui/chrome_pages.cc

@@ -370,8 +370,14 @@ void ShowBrowserSignin(Browser* browser, signin_metrics::Source source) {

// away from Chrome, and accidentally close the avatar bubble. The same will

// happen if we had to switch browser windows to show the sign in page. In

// this case, fallback to the full-tab signin page.

- if (switches::IsNewAvatarMenu() &&

- source != signin_metrics::SOURCE_APP_LAUNCHER && !switched_browser) {

+ bool show_avatar_bubble =

+ source != signin_metrics::SOURCE_APP_LAUNCHER && !switched_browser;

+#if defined(OS_CHROMEOS)

+ // ChromeOS doesn't have the avatar bubble.

+ show_avatar_bubble = false;

+#endif

+ if (show_avatar_bubble) {

browser->window()->ShowAvatarBubbleFromAvatarButton(

BrowserWindow::AVATAR_BUBBLE_MODE_SIGNIN,

signin::ManageAccountsParams());