chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.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/views/frame/browser_non_client_frame_view_ash.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/frame/browser_non_client_frame_view.cc ('K') | « chrome/browser/ui/views/frame/browser_non_client_frame_view.cc ('k') | chrome/browser/ui/views/frame/glass_browser_frame_view.cc » ('j') | chrome/browser/ui/views/profiles/avatar_menu_button.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc

diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc

index 6ed7b743357dd772de32494456070248bdc27e44..f13b33a029d5798c49ced4ff5e07117871dc17fd 100644

--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc

+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc

@@ -575,7 +575,7 @@ void BrowserNonClientFrameViewAsh::LayoutAvatar() {

#if defined(FRAME_AVATAR_BUTTON)

void BrowserNonClientFrameViewAsh::LayoutNewStyleAvatar() {

- DCHECK(switches::IsNewAvatarMenu());

+ DCHECK(new_avatar_button());

gfx::Size button_size = new_avatar_button()->GetPreferredSize();

int button_x = width() -