trunk/src/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc - Issue 234583008: Revert 263262 "Newly created profiles should have the grey silho..."

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: trunk/src/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc

Issue 234583008: Revert 263262 "Newly created profiles should have the grey silho..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 8 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:

Index: trunk/src/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc

===================================================================

--- trunk/src/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc (revision 263283)

+++ trunk/src/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc (working copy)

@@ -7,7 +7,6 @@

#include "chrome/browser/browser_process.h"

#include "chrome/browser/profiles/avatar_menu.h"

#include "chrome/browser/profiles/profile.h"

-#include "chrome/browser/profiles/profile_avatar_icon_util.h"

#include "chrome/browser/profiles/profile_info_cache.h"

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/browser/profiles/profiles_state.h"

@@ -92,8 +91,7 @@

base::string16 text;

bool is_rectangle = false;

if (browser_view_->IsGuestSession()) {

- avatar = rb.

- GetImageNamed(profiles::GetPlaceholderAvatarIconResourceID());

+ avatar = rb.GetImageNamed(browser_view_->GetGuestIconResourceID());

} else if (browser_view_->IsOffTheRecord()) {

avatar = rb.GetImageNamed(browser_view_->GetOTRIconResourceID());

// TODO(nkostylev): Allow this on ChromeOS once the ChromeOS test