[Mac] Show a warning in the new avatar button/menu if there's an auth error

chrome/browser/ui/cocoa/profiles/avatar_button_controller.mm

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/profiles/avatar_button_controller.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
+#include "components/signin/core/browser/signin_error_controller.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #import "ui/base/cocoa/appkit_utils.h"
 #import "ui/base/cocoa/hover_image_button.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/nine_image_painter_factory.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/image/image_skia_util_mac.h"
 #include "ui/gfx/text_elider.h"
 
 namespace {
 
 const CGFloat kButtonPadding = 12;
 const CGFloat kButtonDefaultPadding = 5;
 const CGFloat kButtonHeight = 27;
 const CGFloat kButtonTitleImageSpacing = 10;
 const CGFloat kMaxButtonContentWidth = 100;
+const CGFloat kAuthErrorIconWidth = 13;
+const CGFloat kAuthErrorIconHeight = 11;
 
 const ui::NinePartImageIds kNormalBorderImageIds =
     IMAGE_GRID(IDR_AVATAR_MAC_BUTTON_NORMAL);
 const ui::NinePartImageIds kHoverBorderImageIds =
     IMAGE_GRID(IDR_AVATAR_MAC_BUTTON_HOVER);
 const ui::NinePartImageIds kPressedBorderImageIds =
     IMAGE_GRID(IDR_AVATAR_MAC_BUTTON_PRESSED);
 const ui::NinePartImageIds kThemedBorderImageIds =
     IMAGE_GRID(IDR_AVATAR_THEMED_MAC_BUTTON_NORMAL);
 
 NSImage* GetImageFromResourceID(int resourceId) {
   return ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
       resourceId).ToNSImage();
 }
 
 }  // namespace
 
 // Button cell with a custom border given by a set of nine-patch image grids.
 @interface CustomThemeButtonCell : NSButtonCell {
  @private
    BOOL isThemedWindow_;
+   BOOL hasError_;
+   base::scoped_nsobject<NSImage> authErrorImage_;
 }
 - (void)setIsThemedWindow:(BOOL)isThemedWindow;
+- (void)setHasError:(BOOL)hasError;
+
 @end
 
 @implementation CustomThemeButtonCell
 - (id)initWithThemedWindow:(BOOL)isThemedWindow {
   if ((self = [super init])) {
     isThemedWindow_ = isThemedWindow;
+    hasError_ = NO;
+
+    gfx::ImageSkia icon = gfx::ImageSkiaOperations::CreateResizedImage(
+        *ui::ResourceBundle::GetSharedInstance().GetImageNamed(
+            IDR_ICON_PROFILES_ACCOUNT_BUTTON_ERROR).ToImageSkia(),
+        skia::ImageOperations::RESIZE_BEST,
+        gfx::Size(kAuthErrorIconWidth, kAuthErrorIconHeight));
+    authErrorImage_.reset([gfx::NSImageFromImageSkia(icon) retain]);
   }
   return self;
 }
 
 - (NSSize)cellSize {
   NSSize buttonSize = [super cellSize];
-  buttonSize.width += 2 * kButtonPadding - 2 * kButtonDefaultPadding;
+  CGFloat errorImageWidth = hasError_ ? kAuthErrorIconWidth : 0;

[msw, 2014/06/03 04:15:31]

nit: errorWidth or imageWidth for a one-liner below.

[noms (inactive), 2014/06/06 20:33:43]

Done.

+  buttonSize.width +=
+      2 * (kButtonPadding - kButtonDefaultPadding) + errorImageWidth;
   buttonSize.height = kButtonHeight;
   return buttonSize;
 }
 
 - (NSRect)drawTitle:(NSAttributedString*)title
           withFrame:(NSRect)frame
              inView:(NSView*)controlView {
   frame.origin.x = kButtonPadding;
   // Ensure there's always a padding between the text and the image.
-  frame.size.width -= kButtonTitleImageSpacing;
+  frame.size.width -= hasError_ ? 2 * kButtonTitleImageSpacing :
+                                  kButtonTitleImageSpacing;
   return [super drawTitle:title withFrame:frame inView:controlView];
 }
 
 - (void)drawImage:(NSImage*)image
         withFrame:(NSRect)frame
            inView:(NSView*)controlView {
+  // If there's an auth error, draw a warning icon before the cell image.
+  if (hasError_) {
+    NSSize imageSize = [authErrorImage_ size];
+    NSRect rect = NSMakeRect(
+        frame.origin.x - imageSize.width - kButtonTitleImageSpacing,
+        (kButtonHeight - imageSize.height) / 2,
+        imageSize.width,
+        imageSize.height);
+    [authErrorImage_ drawInRect:rect
+                       fromRect:NSZeroRect
+                      operation:NSCompositeSourceOver
+                       fraction:1.0
+                 respectFlipped:YES
+                          hints:nil];
+  }
   // For the x-offset, we need to undo the default padding and apply the
   // new one. For the y-offset, increasing the button height means we need
   // to move the image a little down to align it nicely with the text; this
   // was chosen by visual inspection.
   frame = NSOffsetRect(frame, kButtonDefaultPadding - kButtonPadding, 2);
   [super drawImage:image withFrame:frame inView:controlView];
 }
 
 - (void)drawBezelWithFrame:(NSRect)frame
                     inView:(NSView*)controlView {
   HoverState hoverState =
       [base::mac::ObjCCastStrict<HoverImageButton>(controlView) hoverState];
   ui::NinePartImageIds imageIds = kNormalBorderImageIds;
   if (isThemedWindow_)
     imageIds = kThemedBorderImageIds;
 
   if (hoverState == kHoverStateMouseDown)
     imageIds = kPressedBorderImageIds;
   else if (hoverState == kHoverStateMouseOver)
     imageIds = kHoverBorderImageIds;
   ui::DrawNinePartImage(frame, imageIds, NSCompositeSourceOver, 1.0, true);
 }
 
 - (void)setIsThemedWindow:(BOOL)isThemedWindow {
   isThemedWindow_ = isThemedWindow;
 }
+
+- (void)setHasError:(BOOL)hasError {
+  hasError_ = hasError;
+}
+
 @end
 
 @interface AvatarButtonController (Private)
 - (base::string16)getElidedAvatarName;
 - (void)updateAvatarButtonAndLayoutParent:(BOOL)layoutParent;
+- (void)updateErrorStatus:(BOOL)hasError;
 - (void)dealloc;
 - (void)themeDidChangeNotification:(NSNotification*)aNotification;
 @end
 
 @implementation AvatarButtonController
 
 - (id)initWithBrowser:(Browser*)browser {
   if ((self = [super initWithBrowser:browser])) {
     ThemeService* themeService =
         ThemeServiceFactory::GetForProfile(browser->profile());
     isThemedWindow_ = !themeService->UsingSystemTheme();
 
     HoverImageButton* hoverButton =
         [[HoverImageButton alloc] initWithFrame:NSZeroRect];
     [hoverButton setDefaultImage:GetImageFromResourceID(
         IDR_AVATAR_MAC_BUTTON_DROPARROW)];
     [hoverButton setHoverImage:GetImageFromResourceID(
         IDR_AVATAR_MAC_BUTTON_DROPARROW_HOVER)];
     [hoverButton setPressedImage:GetImageFromResourceID(
         IDR_AVATAR_MAC_BUTTON_DROPARROW_PRESSED)];
 
     button_.reset(hoverButton);
     base::scoped_nsobject<CustomThemeButtonCell> cell(
         [[CustomThemeButtonCell alloc] initWithThemedWindow:isThemedWindow_]);
+    SigninErrorController* error =
+        profiles::GetSigninErrorController(browser->profile());
+    if (error)
+      [cell setHasError:error->HasError()];

[msw, 2014/06/03 04:15:31]

ditto nit: should the button state be set if |error| is NIL?

[noms (inactive), 2014/06/06 20:33:43]

As mentioned before, |error| can't be nil once, and non-nil afterwards, so there
won't be a chance that you've displayed a notification and never get to clear
it.

On 2014/06/03 04:15:31, msw wrote:

     [button_ setCell:cell.get()];
     [self setView:button_];
 
     [button_ setBezelStyle:NSShadowlessSquareBezelStyle];
     [button_ setButtonType:NSMomentaryChangeButton];
     [button_ setBordered:YES];
     // This is a workaround for an issue in the HoverImageButton where the
     // button is initially sized incorrectly unless a default image is provided.
     [button_ setImage:GetImageFromResourceID(IDR_AVATAR_MAC_BUTTON_DROPARROW)];
     [button_ setImagePosition:NSImageRight];
     [button_ setAutoresizingMask:NSViewMinXMargin | NSViewMinYMargin];
     [button_ setTarget:self];
     [button_ setAction:@selector(buttonClicked:)];
 
     [self updateAvatarButtonAndLayoutParent:NO];
 
     NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
     [center addObserver:self
                selector:@selector(themeDidChangeNotification:)
                    name:kBrowserThemeDidChangeNotification
                  object:nil];
-
   }
   return self;
 }
 
 - (void)dealloc {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [super dealloc];
 }
 
 - (void)themeDidChangeNotification:(NSNotification*)aNotification {
@@ skipping 15 matching lines @@
   return gfx::ElideText(avatarName,
                         gfx::FontList(gfx::Font([button_ font])),
                         maxTextWidth,
                         gfx::ELIDE_AT_END);
 }
 
 - (void)updateAvatarButtonAndLayoutParent:(BOOL)layoutParent {
   // The button text has a black foreground and a white drop shadow for regular
   // windows, and a light text with a dark drop shadow for guest windows
   // which are themed with a dark background.
-  // TODO(noms): Figure out something similar for themed windows, if possible.

[msw, 2014/06/03 04:15:31]

Why is this no more applicable?

[noms (inactive), 2014/06/06 20:33:43]

Left over todo that never got updated :) The code below deals with themed
windows (see the else branch)

On 2014/06/03 04:15:31, msw wrote:

   base::scoped_nsobject<NSShadow> shadow([[NSShadow alloc] init]);
   [shadow setShadowOffset:NSMakeSize(0, -1)];
   [shadow setShadowBlurRadius:0];
 
   NSColor* foregroundColor;
   if (browser_->profile()->IsGuestSession()) {
     foregroundColor = [NSColor colorWithCalibratedWhite:1.0 alpha:0.9];
     [shadow setShadowColor:[NSColor colorWithCalibratedWhite:0.0 alpha:0.4]];
   } else if (!isThemedWindow_) {
     foregroundColor = [NSColor blackColor];
@@ skipping 29 matching lines @@
 
   if (layoutParent) {
     // Because the width of the button might have changed, the parent browser
     // frame needs to recalculate the button bounds and redraw it.
     [[BrowserWindowController
         browserWindowControllerForWindow:browser_->window()->GetNativeWindow()]
         layoutSubviews];
   }
 }
 
+- (void)updateErrorStatus:(BOOL)hasError {
+  [[button_ cell] setHasError:hasError];
+  [self updateAvatarButtonAndLayoutParent:YES];
+}
+
 @end