chrome/browser/ui/views/profiles/new_avatar_button.cc - Issue 668773002: [Win] The new profiles UI: now at an immersive mode near you

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 668773002: [Win] The new profiles UI: now at an immersive mode near you (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: + curlies Created 6 years, 2 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_ash.cc ('K') | « chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc ('k') | chrome/browser/ui/webui/options/browser_options_handler.cc » ('j') | chrome/browser/ui/webui/options/browser_options_handler.cc » ('J')
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 03b3fd6af1e1e3aa0703185b789b02d37d00f74f..f0c504ff0781c11bf5bf0f5bb358e69108c8070d 100644

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

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

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

generic_avatar_ =

*rb->GetImageNamed(IDR_AVATAR_THEMED_BUTTON_AVATAR).ToImageSkia();

#if defined(OS_WIN)

- } else if (base::win::GetVersion() >= base::win::VERSION_WIN8) {

+ } else if (base::win::GetVersion() >= base::win::VERSION_WIN8 ||

+ browser->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) {

const int kNormalImageSet[] = IMAGE_GRID(IDR_AVATAR_METRO_BUTTON_NORMAL);

const int kHotImageSet[] = IMAGE_GRID(IDR_AVATAR_METRO_BUTTON_HOVER);

const int kPushedImageSet[] = IMAGE_GRID(IDR_AVATAR_METRO_BUTTON_PRESSED);