[rAc OSX] Add support for tooltips in notifications.

chrome/browser/ui/cocoa/autofill/autofill_notification_controller.mm

Index: chrome/browser/ui/cocoa/autofill/autofill_notification_controller.mm
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_notification_controller.mm b/chrome/browser/ui/cocoa/autofill/autofill_notification_controller.mm
index 4c741467b6bde36ae0ab2acc5ab087145172f9fd..9cd6540600c6379dfc7292255e2b487d0151e32f 100644
--- a/chrome/browser/ui/cocoa/autofill/autofill_notification_controller.mm
+++ b/chrome/browser/ui/cocoa/autofill/autofill_notification_controller.mm
@@ -9,8 +9,12 @@
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_nsobject.h"
+#include "base/strings/sys_string_conversions.h"
+#include "chrome/browser/ui/autofill/autofill_dialog_types.h"
 #include "chrome/browser/ui/chrome_style.h"
 #include "chrome/browser/ui/cocoa/autofill/autofill_dialog_constants.h"
+#include "grit/theme_resources.h"
+#include "skia/ext/skia_utils_mac.h"
 
 @interface AutofillNotificationView : NSView {
  @private
@@ -68,21 +72,40 @@
 
 @implementation AutofillNotificationController
 
-- (id)init {
+- (id)initWithNotification:(const autofill::DialogNotification*)notification {
   if (self = [super init]) {
     base::scoped_nsobject<AutofillNotificationView> view(
         [[AutofillNotificationView alloc] initWithFrame:NSZeroRect]);
+    [view setBackgroundColor:
+        gfx::SkColorToCalibratedNSColor(notification->GetBackgroundColor())];
     [self setView:view];
 
     textfield_.reset([[NSTextField alloc] initWithFrame:NSZeroRect]);
     [textfield_ setEditable:NO];
     [textfield_ setBordered:NO];
     [textfield_ setDrawsBackground:NO];
+    [textfield_ setTextColor:
+         gfx::SkColorToCalibratedNSColor(notification->GetTextColor())];
+    [textfield_ setStringValue:
+        base::SysUTF16ToNSString(notification->display_text())];
+    [textfield_ setHidden:notification->HasCheckbox()];
 
     checkbox_.reset([[NSButton alloc] initWithFrame:NSZeroRect]);
     [checkbox_ setButtonType:NSSwitchButton];
-    [checkbox_ setHidden:YES];
-    [view setSubviews:@[textfield_, checkbox_]];
+    [checkbox_ setHidden:!notification->HasCheckbox()];
+    [checkbox_ setState:(notification->checked() ? NSOnState : NSOffState)];
+    [checkbox_ setAttributedTitle:[textfield_ attributedStringValue]];
+
+    tooltipIcon_.reset([[NSImageView alloc] initWithFrame:NSZeroRect]);
+    [tooltipIcon_ setImage:
+        ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
+            IDR_AUTOFILL_TOOLTIP_ICON).ToNSImage()];
+    [tooltipIcon_ setFrameSize:[[tooltipIcon_ image] size]];
+    [tooltipIcon_ setToolTip:
+        base::SysUTF16ToNSString(notification->tooltip_text())];
+    [tooltipIcon_ setHidden:[[tooltipIcon_ toolTip] length] == 0];
+
+    [view setSubviews:@[textfield_, checkbox_, tooltipIcon_]];
   }
   return self;
 }
@@ -100,20 +123,6 @@
   return [[self notificationView] hasArrow];
 }
 
-- (void)setHasCheckbox:(BOOL)hasCheckbox {
-  [checkbox_ setHidden:!hasCheckbox];
-  [textfield_ setHidden:hasCheckbox];
-}
-
-- (NSString*)text {
-  return [textfield_ stringValue];
-}
-
-- (void)setText:(NSString*)string {
-  [textfield_ setStringValue:string];
-  [checkbox_ setAttributedTitle:[textfield_ attributedStringValue]];
-}
-
 - (NSTextField*)textfield {
   return textfield_;
 }
@@ -122,23 +131,16 @@
   return checkbox_;
 }
 
-- (NSColor*)backgroundColor {
-  return [[self notificationView] backgroundColor];
-}
-
-- (void)setBackgroundColor:(NSColor*)backgroundColor {
-  [[self notificationView] setBackgroundColor:backgroundColor];
-}
-
-- (NSColor*)textColor {
-  return [textfield_ textColor];
-}
-
-- (void)setTextColor:(NSColor*)textColor {
-  [textfield_ setTextColor:textColor];
+- (NSImageView*)tooltipIcon {
+  return tooltipIcon_;
 }
 
 - (NSSize)preferredSizeForWidth:(CGFloat)width {
+  width -= 2 * chrome_style::kHorizontalPadding;
+  if (![tooltipIcon_ isHidden])
+    width -= [tooltipIcon_ frame].size.width + chrome_style::kHorizontalPadding;
+  DCHECK_GT(width, 0);
+
   NSCell* cell = [checkbox_ isHidden] ? [textfield_ cell] : [checkbox_ cell];
   NSSize preferredSize =
       [cell cellSizeForBounds:NSMakeRect(0, 0, width, CGFLOAT_MAX)];
@@ -160,12 +162,23 @@
   if ([[self notificationView] hasArrow])
     bounds.size.height -= autofill::kArrowHeight;
 
-  NSRect textFrame = NSInsetRect(bounds,
+  // Calculate the frame size, leaving room for padding around the notification,
+  // as well as for the tooltip if it is visible.
+  NSRect labelFrame = NSInsetRect(bounds,
                                  chrome_style::kHorizontalPadding,
                                  autofill::kNotificationPadding);
-  NSControl* control =
-      [checkbox_ isHidden] ? textfield_.get() : checkbox_.get();
-  [control setFrame:textFrame];
+  if (![tooltipIcon_ isHidden]) {
+    labelFrame.size.width -=
+        [tooltipIcon_ frame].size.width + chrome_style::kHorizontalPadding;
+  }
+
+  NSView* label = [checkbox_ isHidden] ? textfield_.get() : checkbox_.get();
+  [label setFrame:labelFrame];
+
+  NSPoint tooltipOrigin =

[groby-ooo-7-16, 2013/11/02 01:38:50]

Move into ![tooltipIcon isHidden] ?

[Ilya Sherman, 2013/11/02 01:42:27]

Good call.  Done.

+      NSMakePoint(NSMaxX(labelFrame) + chrome_style::kHorizontalPadding,
+                  NSMidY(labelFrame) - (NSHeight([tooltipIcon_ frame]) / 2.0));
+  [tooltipIcon_ setFrameOrigin:tooltipOrigin];
 }
 
 @end