Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5352)

Unified Diff: chrome/browser/ui/cocoa/browser_window_controller.mm

Issue 15932008: Add managed user avatar menu for mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments. Created 7 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
Index: chrome/browser/ui/cocoa/browser_window_controller.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm
index c17c34d79d1bce4175d7df18a644027493ccdfcf..70feb0165ac7e3c863fb0d1f8210dd3ee56e76a1 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -18,6 +18,7 @@
#include "chrome/browser/bookmarks/bookmark_model_factory.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/devtools/devtools_window.h"
+#include "chrome/browser/managed_mode/managed_user_service.h"
#include "chrome/browser/profiles/avatar_menu_model.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_info_cache.h"
@@ -1625,6 +1626,8 @@ enum {
// TODO(dmaclach): Instead of redrawing the whole window, views that care
// about the active window state should be registering for notifications.
[[self window] setViewsNeedDisplay:YES];
+ if (avatarButtonController_.get())
+ [avatarButtonController_ updateColors:[self themeProvider]];
}
- (ui::ThemeProvider*)themeProvider {
@@ -1726,6 +1729,16 @@ enum {
// image to display based on the browser.
avatarButtonController_.reset(
[[AvatarButtonController alloc] initWithBrowser:browser_.get()]);
+ if ([avatarButtonController_ labelView]) {
+ [avatarButtonController_ updateColors:[self themeProvider]];
+ NSTextField* label = [avatarButtonController_ labelView];
+ [label setNeedsDisplay:YES];
+ [label setHidden:![self shouldShowAvatar]];
+
+ // Install the view.
+ [[avatarButtonController_ view] addSubview:label];
+ }
+
NSView* view = [avatarButtonController_ view];
[view setAutoresizingMask:NSViewMinXMargin | NSViewMinYMargin];
[view setHidden:![self shouldShowAvatar]];

Powered by Google App Engine
This is Rietveld 408576698