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

Unified Diff: chrome/browser/ui/cocoa/framed_browser_window.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/framed_browser_window.mm
diff --git a/chrome/browser/ui/cocoa/framed_browser_window.mm b/chrome/browser/ui/cocoa/framed_browser_window.mm
index a868fa0b41cc3c1cb2331fa6d0501f985ecbd52f..800f9f270c7bc2c0626286efff92b47d98971d75 100644
--- a/chrome/browser/ui/cocoa/framed_browser_window.mm
+++ b/chrome/browser/ui/cocoa/framed_browser_window.mm
@@ -7,6 +7,7 @@
#include "base/logging.h"
#include "chrome/browser/global_keyboard_shortcuts_mac.h"
#include "chrome/browser/profiles/profile_info_util.h"
+#include "chrome/browser/ui/cocoa/browser/avatar_button_controller.h"
#import "chrome/browser/ui/cocoa/browser_window_controller.h"
#import "chrome/browser/ui/cocoa/custom_frame_view.h"
#import "chrome/browser/ui/cocoa/nsview_additions.h"
@@ -321,6 +322,8 @@ const CGFloat kWindowGradientHeight = 24.0;
AvatarButtonController* avatarButtonVC = [bwc avatarButtonController];
NSView* avatarButton = [avatarButtonVC view];
origin.x = -(NSWidth([avatarButton frame]) + 3);
+ if ([avatarButtonVC labelView])
+ origin.x -= NSWidth([[avatarButtonVC labelView] frame]) + 10;
} else {
origin.x -= 6;
}

Powered by Google App Engine
This is Rietveld 408576698