Add a help bubble pointing to the omnibox when installing an extension with

chrome/browser/cocoa/extension_installed_bubble_controller.mm

 // Copyright (c) 2010 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 "extension_installed_bubble_controller.h"
 
 #include "app/l10n_util.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 72 matching lines @@
   if ((self = [super initWithWindowNibPath:nibPath owner:self])) {
     DCHECK(parentWindow);
     parentWindow_ = parentWindow;
     DCHECK(extension);
     extension_ = extension;
     DCHECK(browser);
     browser_ = browser;
     icon_.reset([gfx::SkBitmapToNSImage(icon) retain]);
     pageActionRemoved_ = NO;
 
-    if (extension->browser_action()) {
+    if (!extension->omnibox_keyword().empty()) {
+      type_ = extension_installed_bubble::kOmniboxKeyword;
+    } else if (extension->browser_action()) {
       type_ = extension_installed_bubble::kBrowserAction;
     } else if (extension->page_action() &&
                !extension->page_action()->default_icon_path().empty()) {
       type_ = extension_installed_bubble::kPageAction;
     } else {
       NOTREACHED();  // kGeneric installs handled in the extension_install_ui.
     }
 
     // Start showing window only after extension has fully loaded.
     extensionObserver_.reset(new ExtensionLoadedNotificationObserver(
@@ skipping 63 matching lines @@
 // We need to calculate the location of these icons and the size of the
 // message itself (which varies with the title of the extension) in order
 // to figure out the origin point for the extension installed bubble.
 // TODO(mirandac): add framework to easily test extension UI components!
 - (NSPoint)calculateArrowPoint {
   BrowserWindowCocoa* window =
       static_cast<BrowserWindowCocoa*>(browser_->window());
   NSPoint arrowPoint = NSZeroPoint;
 
   switch(type_) {
+    case extension_installed_bubble::kOmniboxKeyword: {
+      LocationBarViewMac* locationBarView =
+          [window->cocoa_controller() locationBarBridge];
+      arrowPoint = locationBarView->GetPageInfoBubblePoint();
+      break;
+    }
     case extension_installed_bubble::kBrowserAction: {
       BrowserActionsController* controller =
           [[window->cocoa_controller() toolbarController]
               browserActionsController];
       arrowPoint = [controller popupPointForBrowserAction:extension_];
       break;
     }
     case extension_installed_bubble::kPageAction: {
       LocationBarViewMac* locationBarView =
           [window->cocoa_controller() locationBarBridge];
@@ skipping 41 matching lines @@
 
   // Now that we have resized the window, adjust y pos of the messages.
   [self setMessageFrames:newWindowHeight];
 
   // Find window origin, taking into account bubble size and arrow location.
   NSPoint origin =
       [parentWindow_ convertBaseToScreen:[self calculateArrowPoint]];
   NSSize offsets = NSMakeSize(info_bubble::kBubbleArrowXOffset +
                               info_bubble::kBubbleArrowWidth / 2.0, 0);
   offsets = [[window contentView] convertSize:offsets toView:nil];
-  origin.x -= NSWidth([window frame]) - offsets.width;
+  if ([infoBubbleView_ arrowLocation] == info_bubble::kTopRight)
+    origin.x -= NSWidth([window frame]) - offsets.width;
   origin.y -= NSHeight([window frame]);
   [window setFrameOrigin:origin];
 
   [parentWindow_ addChildWindow:window
                         ordered:NSWindowAbove];
   [window makeKeyAndOrderFront:self];
 }
 
 // Finish nib loading, set arrow location and load icon into window.  This
 // function is exposed for unit testing.
 - (NSWindow*)initializeWindow {
   NSWindow* window = [self window];  // completes nib load
-  [infoBubbleView_ setArrowLocation:info_bubble::kTopRight];
+
+  if (type_ == extension_installed_bubble::kOmniboxKeyword) {
+    [infoBubbleView_ setArrowLocation:info_bubble::kTopLeft];

[Bons, 2010/11/11 19:28:57]

is there a default arrow position? I ask because if it defaults to be at the top
left, then you'd only have to change it if the type was not the OmniboxKeyword.

[Matt Perry, 2010/11/12 07:20:25]

There is, but it feels safer not relying on the defaults to be a certain way.

+  } else {
+    [infoBubbleView_ setArrowLocation:info_bubble::kTopRight];
+  }
 
   // Set appropriate icon, resizing if necessary.
   if ([icon_ size].width > extension_installed_bubble::kIconSize) {
     [icon_ setSize:NSMakeSize(extension_installed_bubble::kIconSize,
                               extension_installed_bubble::kIconSize)];
   }
   [iconImage_ setImage:icon_];
   [iconImage_ setNeedsDisplay:YES];
   return window;
  }
 
 // Calculate the height of each install message, resizing messages in their
 // frames to fit window width.  Return the new window height, based on the
 // total of all message heights.
 - (int)calculateWindowHeight {
   // Adjust the window height to reflect the sum height of all messages
   // and vertical padding.
   int newWindowHeight = 2 * extension_installed_bubble::kOuterVerticalMargin;
 
   // First part of extension installed message.
   [extensionInstalledMsg_ setStringValue:l10n_util::GetNSStringF(
       IDS_EXTENSION_INSTALLED_HEADING, UTF8ToUTF16(extension_->name()))];
   [GTMUILocalizerAndLayoutTweaker
       sizeToFitFixedWidthTextField:extensionInstalledMsg_];
   newWindowHeight += [extensionInstalledMsg_ frame].size.height +
       extension_installed_bubble::kInnerVerticalMargin;
 
   // If type is page action, include a special message about page actions.
   if (type_ == extension_installed_bubble::kPageAction) {
-    [pageActionInfoMsg_ setHidden:NO];
-    [[pageActionInfoMsg_ cell]
+    [extraInfoMsg_ setHidden:NO];
+    [[extraInfoMsg_ cell]
         setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
     [GTMUILocalizerAndLayoutTweaker
-        sizeToFitFixedWidthTextField:pageActionInfoMsg_];
-    newWindowHeight += [pageActionInfoMsg_ frame].size.height +
+        sizeToFitFixedWidthTextField:extraInfoMsg_];
+    newWindowHeight += [extraInfoMsg_ frame].size.height +
         extension_installed_bubble::kInnerVerticalMargin;
   }
 
+  // If type is omnibox keyword, include a special message about the keyword.
+  if (type_ == extension_installed_bubble::kOmniboxKeyword) {
+    [extraInfoMsg_ setStringValue:l10n_util::GetNSStringF(
+        IDS_EXTENSION_INSTALLED_OMNIBOX_KEYWORD_INFO,
+        UTF8ToUTF16(extension_->omnibox_keyword()))];
+    [extraInfoMsg_ setHidden:NO];
+    [[extraInfoMsg_ cell]
+        setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
+    [GTMUILocalizerAndLayoutTweaker
+        sizeToFitFixedWidthTextField:extraInfoMsg_];
+    newWindowHeight += [extraInfoMsg_ frame].size.height +
+        extension_installed_bubble::kInnerVerticalMargin;
+  }
+
   // Second part of extension installed message.
   [[extensionInstalledInfoMsg_ cell]
       setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
   [GTMUILocalizerAndLayoutTweaker
       sizeToFitFixedWidthTextField:extensionInstalledInfoMsg_];
   newWindowHeight += [extensionInstalledInfoMsg_ frame].size.height;
 
   return newWindowHeight;
 }
 
 // Adjust y-position of messages to sit properly in new window height.
 - (void)setMessageFrames:(int)newWindowHeight {
   // The extension messages will always be shown.
   NSRect extensionMessageFrame1 = [extensionInstalledMsg_ frame];
   NSRect extensionMessageFrame2 = [extensionInstalledInfoMsg_ frame];
 
   extensionMessageFrame1.origin.y = newWindowHeight - (
       extensionMessageFrame1.size.height +
       extension_installed_bubble::kOuterVerticalMargin);
   [extensionInstalledMsg_ setFrame:extensionMessageFrame1];
-  if (type_ == extension_installed_bubble::kPageAction) {
-    // The page action message is only shown when appropriate.
-    NSRect pageActionMessageFrame = [pageActionInfoMsg_ frame];
-    pageActionMessageFrame.origin.y = extensionMessageFrame1.origin.y - (
-        pageActionMessageFrame.size.height +
+  if (type_ == extension_installed_bubble::kPageAction ||
+      type_ == extension_installed_bubble::kOmniboxKeyword) {
+    // The extra message is only shown when appropriate.
+    NSRect extraMessageFrame = [extraInfoMsg_ frame];
+    extraMessageFrame.origin.y = extensionMessageFrame1.origin.y - (
+        extraMessageFrame.size.height +
         extension_installed_bubble::kInnerVerticalMargin);
-    [pageActionInfoMsg_ setFrame:pageActionMessageFrame];
-    extensionMessageFrame2.origin.y = pageActionMessageFrame.origin.y - (
+    [extraInfoMsg_ setFrame:extraMessageFrame];
+    extensionMessageFrame2.origin.y = extraMessageFrame.origin.y - (
         extensionMessageFrame2.size.height +
         extension_installed_bubble::kInnerVerticalMargin);
   } else {
     extensionMessageFrame2.origin.y = extensionMessageFrame1.origin.y - (
         extensionMessageFrame2.size.height +
         extension_installed_bubble::kInnerVerticalMargin);
   }
   [extensionInstalledInfoMsg_ setFrame:extensionMessageFrame2];
 }
 
 // Exposed for unit testing.
 - (NSRect)getExtensionInstalledMsgFrame {
   return [extensionInstalledMsg_ frame];
 }
 
 - (NSRect)getPageActionInfoMsgFrame {

[Bons, 2010/11/11 19:28:57]

i guess this method should be renamed as well.

[Matt Perry, 2010/11/12 07:20:25]

Done.

-  return [pageActionInfoMsg_ frame];
+  return [extraInfoMsg_ frame];
 }
 
 - (NSRect)getExtensionInstalledInfoMsgFrame {
   return [extensionInstalledInfoMsg_ frame];
 }
 
 - (void)extensionUnloaded:(id)sender {
   extension_ = NULL;
 }
 
 @end