chrome/browser/ui/views/profiles/new_avatar_button.cc - Issue 1608843002: Start untangling the avatar switcher from BrowserNonClientFrameView

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/profiles/new_avatar_button.cc

Issue 1608843002: Start untangling the avatar switcher from BrowserNonClientFrameView (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20160119-MacViewsBrowser-Compile

Patch Set: various selfnits Created 4 years, 11 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_button_style.h ('K') | « chrome/browser/ui/views/profiles/new_avatar_button.h ('k') | chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/profiles/new_avatar_button.cc

diff --git a/chrome/browser/ui/views/profiles/new_avatar_button.cc b/chrome/browser/ui/views/profiles/new_avatar_button.cc

index 8e637bdd440d1c4b5a9c646c420448cf2dd627f3..d506480f80b29a74c2969abde8926ebafa6afab0 100644

--- a/chrome/browser/ui/views/profiles/new_avatar_button.cc

+++ b/chrome/browser/ui/views/profiles/new_avatar_button.cc

@@ -72,7 +72,7 @@ NewAvatarButton::NewAvatarButton(views::ButtonListener* listener,

SetFontList(GetFontList().DeriveWithHeightUpperBound(kDisplayFontHeight));

ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();

- if (button_style == THEMED_BUTTON) {

+ if (button_style == AVATAR_BUTTON_THEMED) {

const int kNormalImageSet[] = IMAGE_GRID(IDR_AVATAR_THEMED_BUTTON_NORMAL);

const int kHotImageSet[] = IMAGE_GRID(IDR_AVATAR_THEMED_BUTTON_HOVER);

const int kPushedImageSet[] = IMAGE_GRID(IDR_AVATAR_THEMED_BUTTON_PRESSED);