chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm - Issue 316863002: Rename "managed (mode|user)" to "supervised user" (part 1)

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/cocoa/profiles/profile_chooser_controller.mm

Issue 316863002: Rename "managed (mode|user)" to "supervised user" (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 6 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/cocoa/profiles/avatar_menu_bubble_controller.mm ('k') | chrome/browser/ui/cocoa/profiles/profile_menu_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm

diff --git a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm

index c1b84666aebe8bc76e466633013286a66a890d66..ba08b6d7ec458b5492c0a27e54c474fdee0066dd 100644

--- a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm

+++ b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm

@@ -1028,7 +1028,7 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,

}

// For supervised users, add the disclaimer text.

- if (browser_->profile()->IsManaged()) {

+ if (browser_->profile()->IsSupervised()) {

yOffset += kSmallVerticalSpacing;

NSView* disclaimerContainer = [self createSupervisedUserDisclaimerView];

[disclaimerContainer setFrameOrigin:NSMakePoint(0, yOffset)];

@@ -1239,7 +1239,8 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,

}

// Profile name, centered.

- bool editingAllowed = !isGuestSession_ && !browser_->profile()->IsManaged();

+ bool editingAllowed = !isGuestSession_ &&

+ !browser_->profile()->IsSupervised();

base::scoped_nsobject<EditableProfileNameButton> profileName(

[[EditableProfileNameButton alloc]

initWithFrame:NSMakeRect(xOffset, yOffset,

@@ -1268,7 +1269,7 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,

[container addSubview:iconView];

yOffset = NSMaxY([iconView frame]);

- if (browser_->profile()->IsManaged()) {

+ if (browser_->profile()->IsSupervised()) {

base::scoped_nsobject<NSImageView> supervisedIcon(

[[NSImageView alloc] initWithFrame:NSZeroRect]);

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

@@ -1370,7 +1371,7 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,

int availableTextWidth = kFixedMenuWidth - 2 * kHorizontalSpacing;

NSTextField* disclaimer = BuildLabel(

- base::SysUTF16ToNSString(avatarMenu_->GetManagedUserInformation()),

+ base::SysUTF16ToNSString(avatarMenu_->GetSupervisedUserInformation()),

NSMakePoint(kHorizontalSpacing, yOffset),

nil /* background_color */,

nil /* text_color */);