[rAc OSX] Add support for tooltips in notifications.

[rAc OSX] Add support for tooltips in notifications.

BUG=286528
TEST=unit_tests
R=groby@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=232849

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

LGTM w/ nit

https://codereview.chromium.org/54303007/diff/100001/chrome/browser/ui/cocoa/...
File chrome/browser/ui/cocoa/autofill/autofill_notification_controller.mm
(right):

https://codereview.chromium.org/54303007/diff/100001/chrome/browser/ui/cocoa/...
chrome/browser/ui/cocoa/autofill/autofill_notification_controller.mm:178:
NSPoint tooltipOrigin =
Move into ![tooltipIcon isHidden] ?

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

https://codereview.chromium.org/54303007/diff/100001/chrome/browser/ui/cocoa/...
File chrome/browser/ui/cocoa/autofill/autofill_notification_controller.mm
(right):

https://codereview.chromium.org/54303007/diff/100001/chrome/browser/ui/cocoa/...
chrome/browser/ui/cocoa/autofill/autofill_notification_controller.mm:178:
NSPoint tooltipOrigin =
On 2013/11/02 01:38:50, groby wrote:
> Move into ![tooltipIcon isHidden] ?

Good call.  Done.

[commit-bot: I haz the power, 2013-11-02 01:45:28]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/isherman@chromium.org/54303007/140001

[commit-bot: I haz the power, 2013-11-02 01:45:34]

Failed to apply patch for
chrome/browser/ui/cocoa/autofill/autofill_notification_controller.mm:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file
chrome/browser/ui/cocoa/autofill/autofill_notification_controller.mm
  Hunk #3 FAILED at 123.
  Hunk #4 FAILED at 145.
  Hunk #5 succeeded at 199 (offset 16 lines).
  2 out of 5 hunks FAILED -- saving rejects to file
chrome/browser/ui/cocoa/autofill/autofill_notification_controller.mm.rej

Patch:      
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..24691278bfebae4aed15a9283d4935219f484ce2
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,26 @@
   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];
+
+  if (![tooltipIcon_ isHidden]) {
+    NSPoint tooltipOrigin =
+        NSMakePoint(
+            NSMaxX(labelFrame) + chrome_style::kHorizontalPadding,
+            NSMidY(labelFrame) - (NSHeight([tooltipIcon_ frame]) / 2.0));
+    [tooltipIcon_ setFrameOrigin:tooltipOrigin];
+  }
 }
 
 @end

[commit-bot: I haz the power, 2013-11-02 02:11:45]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/isherman@chromium.org/54303007/190001

[commit-bot: I haz the power, 2013-11-02 04:15:48]

Retried try job too often on mac_rel for step(s) unit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&nu...

[commit-bot: I haz the power, 2013-11-04 07:24:57]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/isherman@chromium.org/54303007/460001

[commit-bot: I haz the power, 2013-11-04 09:51:50]

Retried try job too often on win_rel for step(s) browser_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[commit-bot: I haz the power, 2013-11-04 19:41:36]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/isherman@chromium.org/54303007/460001

[commit-bot: I haz the power, 2013-11-04 23:22:09]

Retried try job too often on win_rel for step(s) browser_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[Ilya Sherman, 2013-11-05 00:22:34]

Committed patchset #7 manually as r232849 (presubmit successful).

[commit-bot: I haz the power, 2013-11-05 00:24:09]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/isherman@chromium.org/54303007/460001

[commit-bot: I haz the power, 2013-11-05 00:24:12]

Failed to apply patch for
chrome/browser/ui/cocoa/autofill/autofill_notification_container.mm:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file
chrome/browser/ui/cocoa/autofill/autofill_notification_container.mm
  Hunk #1 FAILED at 6.
  Hunk #2 FAILED at 75.
  2 out of 2 hunks FAILED -- saving rejects to file
chrome/browser/ui/cocoa/autofill/autofill_notification_container.mm.rej

Patch:       chrome/browser/ui/cocoa/autofill/autofill_notification_container.mm
Index: chrome/browser/ui/cocoa/autofill/autofill_notification_container.mm
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_notification_container.mm
b/chrome/browser/ui/cocoa/autofill/autofill_notification_container.mm
index
4b504bd5125e1e1331c6fda9818d04923ba874c1..12ec13d78336cf42720e1cd6ac2d32ebab32ab42
100644
--- a/chrome/browser/ui/cocoa/autofill/autofill_notification_container.mm
+++ b/chrome/browser/ui/cocoa/autofill/autofill_notification_container.mm
@@ -6,12 +6,10 @@
 
 #include "base/logging.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/autofill/autofill_dialog_view_delegate.h"
 #include "chrome/browser/ui/cocoa/autofill/autofill_dialog_constants.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_notification_controller.h"
-#include "skia/ext/skia_utils_mac.h"
 
 @implementation AutofillNotificationContainer
 
@@ -75,32 +73,23 @@
     // Create basic notification view.
     const autofill::DialogNotification& notification = notifications[i];
     base::scoped_nsobject<AutofillNotificationController>
-        notificationController([[AutofillNotificationController alloc] init]);
-    [notificationController setText:
-        base::SysUTF16ToNSString(notification.display_text())];
-    [notificationController setTextColor:
-        gfx::SkColorToCalibratedNSColor(notification.GetTextColor())];
-    [notificationController setBackgroundColor:
-        gfx::SkColorToCalibratedNSColor(notification.GetBackgroundColor())];
-
-    // Add optional checkbox.
+        notificationController([[AutofillNotificationController alloc]
+                                    initWithNotification:&notification]);
+
+    if (i == 0) {
+      [notificationController setHasArrow:notification.HasArrow()
+                           withAnchorView:anchorView_];
+    }
+
     if (notification.HasCheckbox()) {
       // No more than one notification with a checkbox.
       DCHECK(!checkboxNotification_);
       checkboxNotification_.reset(
           new autofill::DialogNotification(notification));
-      [notificationController setHasCheckbox:YES];
-      [[notificationController checkbox] setState:
-          (notification.checked() ? NSOnState : NSOffState)];
       [[notificationController checkbox] setTarget:self];
       [[notificationController checkbox]
setAction:@selector(checkboxClicked:)];
     }
 
-    if (i == 0) {
-      [notificationController setHasArrow:notification.HasArrow()
-                           withAnchorView:anchorView_];
-    }
-
     [notificationControllers_ addObject:notificationController];
     [[self view] addSubview:[notificationController view]];
   }