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

chrome/browser/ui/views/extensions/extension_installed_bubble.cc

 // 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.
 
 #include "chrome/browser/views/extensions/extension_installed_bubble.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
@@ skipping 81 matching lines @@
 
     if (type_ == ExtensionInstalledBubble::PAGE_ACTION) {
       info_ = new views::Label(l10n_util::GetString(
           IDS_EXTENSION_INSTALLED_PAGE_ACTION_INFO));
       info_->SetFont(font);
       info_->SetMultiLine(true);
       info_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
       AddChildView(info_);
     }
 
+    if (type_ == ExtensionInstalledBubble::OMNIBOX_KEYWORD) {
+      info_ = new views::Label(l10n_util::GetStringF(
+          IDS_EXTENSION_INSTALLED_OMNIBOX_KEYWORD_INFO,
+          UTF8ToUTF16(extension->omnibox_keyword())));
+      info_->SetFont(font);
+      info_->SetMultiLine(true);
+      info_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+      AddChildView(info_);
+    }
+
     manage_ = new views::Label(
         l10n_util::GetString(IDS_EXTENSION_INSTALLED_MANAGE_INFO));
     manage_->SetFont(font);
     manage_->SetMultiLine(true);
     manage_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     AddChildView(manage_);
 
     close_button_ = new views::ImageButton(this);
     close_button_->SetImage(views::CustomButton::BS_NORMAL,
         rb.GetBitmapNamed(IDR_CLOSE_BAR));
@@ skipping 22 matching lines @@
     int width = kHorizOuterMargin;
     width += kIconSize;
     width += kPanelHorizMargin;
     width += kRightColumnWidth;
     width += 2*kPanelHorizMargin;
     width += kHorizOuterMargin;
 
     int height = kVertOuterMargin;
     height += heading_->GetHeightForWidth(kRightColumnWidth);
     height += kVertInnerMargin;
-    if (type_ == ExtensionInstalledBubble::PAGE_ACTION) {
+    if (type_ == ExtensionInstalledBubble::PAGE_ACTION ||
+        type_ == ExtensionInstalledBubble::OMNIBOX_KEYWORD) {
       height += info_->GetHeightForWidth(kRightColumnWidth);
       height += kVertInnerMargin;
     }
     height += manage_->GetHeightForWidth(kRightColumnWidth);
     height += kVertOuterMargin;
 
     return gfx::Size(width, std::max(height, kIconSize + 2 * kVertOuterMargin));
   }
 
   virtual void Layout() {
     int x = kHorizOuterMargin;
     int y = kVertOuterMargin;
 
     icon_->SetBounds(x, y, kIconSize, kIconSize);
     x += kIconSize;
     x += kPanelHorizMargin;
 
     y += kRightcolumnVerticalShift;
     heading_->SizeToFit(kRightColumnWidth);
     heading_->SetX(x);
     heading_->SetY(y);
     y += heading_->height();
     y += kVertInnerMargin;
 
-    if (type_ == ExtensionInstalledBubble::PAGE_ACTION) {
+    if (type_ == ExtensionInstalledBubble::PAGE_ACTION ||
+        type_ == ExtensionInstalledBubble::OMNIBOX_KEYWORD) {
       info_->SizeToFit(kRightColumnWidth);
       info_->SetX(x);
       info_->SetY(y);
       y += info_->height();
       y += kVertInnerMargin;
     }
 
     manage_->SizeToFit(kRightColumnWidth);
     manage_->SetX(x);
     manage_->SetY(y);
@@ skipping 31 matching lines @@
 
 ExtensionInstalledBubble::ExtensionInstalledBubble(const Extension* extension,
                                                    Browser *browser,
                                                    SkBitmap icon)
     : extension_(extension),
       browser_(browser),
       icon_(icon),
       animation_wait_retries_(0) {
   AddRef();  // Balanced in InfoBubbleClosing.
 
-  if (extension_->browser_action()) {
+  if (!extension_->omnibox_keyword().empty()) {
+    type_ = OMNIBOX_KEYWORD;
+  } else if (extension_->browser_action()) {
     type_ = BROWSER_ACTION;
   } else if (extension->page_action() &&
              !extension->page_action()->default_icon_path().empty()) {
     type_ = PAGE_ACTION;
   } else {
     type_ = GENERIC;
   }
 
   // |extension| has been initialized but not loaded at this point. We need
   // to wait on showing the Bubble until not only the EXTENSION_LOADED gets
@@ skipping 53 matching lines @@
       if (!reference_view || !reference_view->IsVisible())
         reference_view = NULL;  // fall back to app menu below.
     }
   } else if (type_ == PAGE_ACTION) {
     LocationBarView* location_bar_view = browser_view->GetLocationBarView();
     location_bar_view->SetPreviewEnabledPageAction(extension_->page_action(),
                                                    true);  // preview_enabled
     reference_view = location_bar_view->GetPageActionView(
         extension_->page_action());
     DCHECK(reference_view);
+  } else if (type_ == OMNIBOX_KEYWORD) {
+    LocationBarView* location_bar_view = browser_view->GetLocationBarView();
+    reference_view = location_bar_view;
+    DCHECK(reference_view);
   }
 
   // Default case.
   if (reference_view == NULL)
     reference_view = browser_view->GetToolbarView()->app_menu();
 
   gfx::Point origin;
   views::View::ConvertPointToScreen(reference_view, &origin);
   gfx::Rect bounds = reference_view->bounds();
-  bounds.set_x(origin.x());
-  bounds.set_y(origin.y());
+  bounds.set_origin(origin);
+  BubbleBorder::ArrowLocation arrow_location = BubbleBorder::TOP_RIGHT;
 
-  bubble_content_ = new InstalledBubbleContent(extension_, type_,
-      &icon_);
+  // For omnibox keyword bubbles, move the arrow to point to the left edge
+  // of the omnibox, just to the right of the icon.
+  if (type_ == OMNIBOX_KEYWORD) {
+    bounds.set_origin(
+        browser_view->GetLocationBarView()->GetLocationEntryOrigin());
+    bounds.set_width(0);
+    arrow_location = BubbleBorder::TOP_LEFT;
+  }
+
+  bubble_content_ = new InstalledBubbleContent(extension_, type_, &icon_);
   InfoBubble* info_bubble =
-      InfoBubble::Show(browser_view->GetWidget(), bounds,
-                       BubbleBorder::TOP_RIGHT,
+      InfoBubble::Show(browser_view->GetWidget(), bounds, arrow_location,
                        bubble_content_, this);
   bubble_content_->set_info_bubble(info_bubble);
 }
 
 // InfoBubbleDelegate
 void ExtensionInstalledBubble::InfoBubbleClosing(InfoBubble* info_bubble,
                                                  bool closed_by_escape) {
   if (extension_ && type_ == PAGE_ACTION) {
     BrowserView* browser_view = BrowserView::GetBrowserViewForNativeWindow(
         browser_->window()->GetNativeHandle());
     browser_view->GetLocationBarView()->SetPreviewEnabledPageAction(
         extension_->page_action(),
         false);  // preview_enabled
   }
 
   Release();  // Balanced in ctor.
 }