chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.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/opaque_browser_frame_view_layout.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/views/frame/glass_browser_frame_view.cc ('k') | chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 91f71c9044c7e3bb1491a285ff42dc1a888b9d79..ea63ba1649739c32c774dc0558cd5cf10dbd1ca5 100644

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

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

@@ -391,7 +391,6 @@ void OpaqueBrowserFrameViewLayout::LayoutTitleBar(views::View* host) {

}

void OpaqueBrowserFrameViewLayout::LayoutNewStyleAvatar(views::View* host) {

- DCHECK(switches::IsNewAvatarMenu());

if (!new_avatar_button_)

return;

@@ -689,7 +688,7 @@ void OpaqueBrowserFrameViewLayout::Layout(views::View* host) {

// on the trailing side.

leading_button_start_++;

- if (delegate_->IsRegularOrGuestSession() && switches::IsNewAvatarMenu())

+ if (delegate_->IsRegularOrGuestSession())

LayoutNewStyleAvatar(host);

else

LayoutAvatar(host);