chrome/browser/profiles/avatar_menu.cc - Issue 898533005: Rename for some supervised users ambiguity. Adding child account icon to the avatar menu bubble.

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

Issue 898533005: Rename for some supervised users ambiguity. Adding child account icon to the avatar menu bubble. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 10 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/chromeos/login/screens/user_selection_screen.cc ('k') | chrome/browser/resources/chromeos/login/screen_gaia_signin.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/avatar_menu.cc

diff --git a/chrome/browser/profiles/avatar_menu.cc b/chrome/browser/profiles/avatar_menu.cc

index e86296f8ac55358c92903d45cf59929e586ac60e..c32cf1e9c6e821abe60be614a7e4470b8aac0e07 100644

--- a/chrome/browser/profiles/avatar_menu.cc

+++ b/chrome/browser/profiles/avatar_menu.cc

@@ -225,8 +225,11 @@ base::string16 AvatarMenu::GetSupervisedUserInformation() const {

}

const gfx::Image& AvatarMenu::GetSupervisedUserIcon() const {

+ if (browser_ && browser_->profile()->IsChild())

Marc Treib 2015/02/05 12:25:06 nit: Add braces for multiline "if" body. This is

merkulova 2015/02/05 12:41:11 Added braces. Ok, thanks)

+ return ResourceBundle::GetSharedInstance().GetNativeImageNamed(

+ IDR_CHILD_USER_ICON);

return ResourceBundle::GetSharedInstance().GetNativeImageNamed(

- IDR_SUPERVISED_USER_ICON);

+ IDR_LEGACY_SUPERVISED_USER_ICON);

}

void AvatarMenu::ActiveBrowserChanged(Browser* browser) {