chrome/browser/ui/webui/chrome_web_ui_controller_factory.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/chrome_web_ui_controller_factory.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: Revert FRAME_AVATAR_BUTTON changes. 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

« chrome/browser/ui/views/profiles/avatar_menu_button.cc ('K') | « chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc ('k') | chrome/browser/ui/webui/options/browser_options_handler.cc » ('j') | chrome/browser/ui/webui/options/manage_profile_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

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

index 4ab4fa4e55073660b041968fd281711ae3f8f3a7..7327581fa5325e67f0a96a054d08a57e46d5dca9 100644

--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

@@ -499,8 +499,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,

return &NewWebUI<InspectUI>;

#endif

#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS)

- if (url.host() == chrome::kChromeUIUserManagerHost &&

- switches::IsNewAvatarMenu()) {

+ if (url.host() == chrome::kChromeUIUserManagerHost) {

Evan Stade 2015/09/25 22:49:10 nit no curlies

anthonyvd 2015/09/29 20:23:16 Done.

return &NewWebUI<UserManagerUI>;

}

#endif