[rAC, OSX] Use a bubble for tooltips.

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

 // Copyright 2013 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/autofill/autofill_notification_controller.h"
 
 #include <algorithm>
 
 #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/autofill/autofill_dialog_view_delegate.h"
 #include "chrome/browser/ui/chrome_style.h"
 #include "chrome/browser/ui/cocoa/autofill/autofill_dialog_constants.h"
+#import "chrome/browser/ui/cocoa/autofill/autofill_tooltip_controller.h"
 #import "chrome/browser/ui/cocoa/hyperlink_text_view.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 
 @interface AutofillNotificationView : NSView {
  @private
   // Weak, determines anchor point for arrow.
   NSView* arrowAnchorView_;
   BOOL hasArrow_;
   base::scoped_nsobject<NSColor> backgroundColor_;
@@ skipping 107 matching lines @@
     [checkbox_ setState:(notification->checked() ? NSOnState : NSOffState)];
     [checkbox_ setAttributedTitle:[textview_ textStorage]];
     [checkbox_ setTarget:self];
     [checkbox_ setAction:@selector(checkboxClicked:)];
     // Set the size that preferredSizeForWidth will use. Do this here because
     //   (1) preferredSizeForWidth is logically const, and so shouldn't have a
     //       side-effect of updating the checkbox's frame, and
     //   (2) this way, the sizing computation can be cached.
     [checkbox_ sizeToFit];
 
-    tooltipIcon_.reset([[NSImageView alloc] initWithFrame:NSZeroRect]);
-    [tooltipIcon_ setImage:
+    tooltipController_.reset([[AutofillTooltipController alloc] init]);
+    [tooltipController_ setImage:
         ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
             IDR_AUTOFILL_TOOLTIP_ICON).ToNSImage()];
-    [tooltipIcon_ setFrameSize:[[tooltipIcon_ image] size]];
-    [tooltipIcon_ setToolTip:
+    [tooltipController_ setMessage:
         base::SysUTF16ToNSString(notification->tooltip_text())];
-    [tooltipIcon_ setHidden:[[tooltipIcon_ toolTip] length] == 0];
+    [[tooltipController_ view] setHidden:
+        [[tooltipController_ message] length] == 0];
 
-    [view setSubviews:@[textview_, checkbox_, tooltipIcon_]];
+    [view setSubviews:@[ textview_, checkbox_, [tooltipController_ view] ]];
   }
   return self;
 }
 
 - (AutofillNotificationView*)notificationView {
   return base::mac::ObjCCastStrict<AutofillNotificationView>([self view]);
 }
 
 - (void)setHasArrow:(BOOL)hasArrow withAnchorView:(NSView*)anchorView {
   [[self notificationView] setAnchorView:anchorView];
   [[self notificationView] setHasArrow:hasArrow];
 }
 
 - (BOOL)hasArrow {
   return [[self notificationView] hasArrow];
 }
 
 - (NSTextView*)textview {
   return textview_;
 }
 
 - (NSButton*)checkbox {
   return checkbox_;
 }
 
-- (NSImageView*)tooltipIcon {
-  return tooltipIcon_;
+- (NSView*)tooltipView {
+  return [tooltipController_ view];
 }
 
 - (NSSize)preferredSizeForWidth:(CGFloat)width {
   width -= 2 * chrome_style::kHorizontalPadding;
-  if (![tooltipIcon_ isHidden])
-    width -= [tooltipIcon_ frame].size.width + chrome_style::kHorizontalPadding;
+  if (![[tooltipController_ view] isHidden]) {
+    width -= NSWidth([[tooltipController_ view] frame]) +
+        chrome_style::kHorizontalPadding;
+  }
   // TODO(isherman): Restore the DCHECK below once I figure out why it causes
   // unit tests to fail.
   //DCHECK_GT(width, 0);
 
   NSSize preferredSize;
   if (![textview_ isHidden]) {
     // This method is logically const. Hence, cache the original frame so that
     // it can be restored once the preferred size has been computed.
     NSRect frame = [textview_ frame];
 
@@ skipping 31 matching lines @@
 - (void)performLayout {
   NSRect bounds = [[self view] bounds];
   if ([[self notificationView] hasArrow])
     bounds.size.height -= autofill::kArrowHeight;
 
   // 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);
-  if (![tooltipIcon_ isHidden]) {
+  NSView* tooltipView = [tooltipController_ view];
+  if (![tooltipView isHidden]) {
     labelFrame.size.width -=
-        [tooltipIcon_ frame].size.width + chrome_style::kHorizontalPadding;
+        NSWidth([tooltipView frame]) + chrome_style::kHorizontalPadding;
   }
 
   NSView* label = [checkbox_ isHidden] ? textview_.get() : checkbox_.get();
   [label setFrame:labelFrame];
 
-  if (![tooltipIcon_ isHidden]) {
+  if (![tooltipView isHidden]) {
     NSPoint tooltipOrigin =
         NSMakePoint(
             NSMaxX(labelFrame) + chrome_style::kHorizontalPadding,
-            NSMidY(labelFrame) - (NSHeight([tooltipIcon_ frame]) / 2.0));
-    [tooltipIcon_ setFrameOrigin:tooltipOrigin];
+            NSMidY(labelFrame) - (NSHeight([tooltipView frame]) / 2.0));
+    [tooltipView setFrameOrigin:tooltipOrigin];
   }
 }
 
 - (IBAction)checkboxClicked:(id)sender {
   DCHECK(sender == checkbox_.get());
   BOOL isChecked = ([checkbox_ state] == NSOnState);
   delegate_->NotificationCheckboxStateChanged(notificationType_, isChecked);
 }
 
 - (BOOL)textView:(NSTextView *)textView
    clickedOnLink:(id)link
          atIndex:(NSUInteger)charIndex {
   delegate_->LinkClicked(linkURL_);
   return YES;
 }
 
 @end