chrome/browser/ui/webui/options/sync_setup_handler.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/webui/options/sync_setup_handler.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/webui/options/manage_profile_handler.cc ('k') | chrome/browser/ui/webui/signin/inline_login_handler_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/sync_setup_handler.cc

diff --git a/chrome/browser/ui/webui/options/sync_setup_handler.cc b/chrome/browser/ui/webui/options/sync_setup_handler.cc

index bbaa3603851e3fcdfda18f4845c2d31aa79af9e0..b77b5ef3b180bf5d51ea789696f969ea2f6f405c 100644

--- a/chrome/browser/ui/webui/options/sync_setup_handler.cc

+++ b/chrome/browser/ui/webui/options/sync_setup_handler.cc

@@ -369,7 +369,7 @@ void SyncSetupHandler::DisplayGaiaLoginInNewTabOrWindow() {

SigninErrorController* error_controller =

SigninErrorControllerFactory::GetForProfile(browser->profile());

DCHECK(error_controller->HasError());

- if (switches::IsNewAvatarMenu() && !force_new_tab) {

+ if (!force_new_tab) {

browser->window()->ShowAvatarBubbleFromAvatarButton(

BrowserWindow::AVATAR_BUBBLE_MODE_REAUTH,

signin::ManageAccountsParams());

@@ -379,7 +379,7 @@ void SyncSetupHandler::DisplayGaiaLoginInNewTabOrWindow() {

}

} else {

signin_metrics::LogSigninSource(signin_metrics::SOURCE_SETTINGS);

- if (switches::IsNewAvatarMenu() && !force_new_tab) {

+ if (!force_new_tab) {

browser->window()->ShowAvatarBubbleFromAvatarButton(

BrowserWindow::AVATAR_BUBBLE_MODE_SIGNIN,

signin::ManageAccountsParams());