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

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

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

index aceef52e8aaafe5e5b06e0a896ee4eaebeb1b683..4cc2664e71c6073737d23e985c32f9e861f0fe3f 100644

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

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

@@ -666,14 +666,15 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {

RegisterTitle(values, "thirdPartyImeConfirmOverlay",

IDS_OPTIONS_SETTINGS_LANGUAGES_THIRD_PARTY_WARNING_TITLE);

+ values->SetBoolean("usingNewProfilesUI", false);

+#else

+ values->SetBoolean("usingNewProfilesUI", true);

#endif

values->SetBoolean("showSetDefault", ShouldShowSetDefaultBrowser());

values->SetBoolean("allowAdvancedSettings", ShouldAllowAdvancedSettings());

- values->SetBoolean("usingNewProfilesUI", switches::IsNewAvatarMenu());

#if defined(OS_CHROMEOS)

values->SetBoolean(

"showWakeOnWifi",