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

chrome/browser/gtk/extension_installed_bubble_gtk.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/gtk/extension_installed_bubble_gtk.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
@@ skipping 39 matching lines @@
 }
 
 ExtensionInstalledBubbleGtk::ExtensionInstalledBubbleGtk(
     const Extension* extension, Browser *browser, SkBitmap icon)
     : extension_(extension),
       browser_(browser),
       icon_(icon),
       animation_wait_retries_(kAnimationWaitRetries) {
   AddRef();  // Balanced in Close().
 
-  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 63 matching lines @@
         browser_window->GetToolbar()->GetLocationBarView();
     location_bar_view->SetPreviewEnabledPageAction(extension_->page_action(),
                                                    true);  // preview_enabled
     reference_widget = location_bar_view->GetPageActionWidget(
         extension_->page_action());
     // glib delays recalculating layout, but we need reference_widget to know
     // it's coordinates, so we force a check_resize here.
     gtk_container_check_resize(GTK_CONTAINER(
         browser_window->GetToolbar()->widget()));
     DCHECK(reference_widget);
+  } else if (type_ == OMNIBOX_KEYWORD) {
+    LocationBarViewGtk* location_bar_view =
+        browser_window->GetToolbar()->GetLocationBarView();
+    reference_widget = location_bar_view->location_entry_widget();
+    DCHECK(reference_widget);
   }
+
   // Default case.
   if (reference_widget == NULL)
     reference_widget = browser_window->GetToolbar()->GetAppMenuButton();
 
   GtkThemeProvider* theme_provider = GtkThemeProvider::GetFrom(
       browser_->profile());
 
   // Setup the InfoBubble content.
   GtkWidget* bubble_content = gtk_hbox_new(FALSE, kHorizontalColumnSpacing);
   gtk_container_set_border_width(GTK_CONTAINER(bubble_content), kContentBorder);
@@ skipping 39 matching lines @@
   char* markup = g_markup_printf_escaped("<span size=\"larger\">%s</span>",
       heading_text.c_str());
   gtk_label_set_markup(GTK_LABEL(heading_label), markup);
   g_free(markup);
 
   gtk_label_set_line_wrap(GTK_LABEL(heading_label), TRUE);
   gtk_widget_set_size_request(heading_label, kTextColumnWidth, -1);
   gtk_box_pack_start(GTK_BOX(text_column), heading_label, FALSE, FALSE, 0);
 
   // Page action label
-  if (type_ == ExtensionInstalledBubbleGtk::PAGE_ACTION) {
+  if (type_ == PAGE_ACTION) {
     GtkWidget* info_label = gtk_label_new(l10n_util::GetStringUTF8(
-            IDS_EXTENSION_INSTALLED_PAGE_ACTION_INFO).c_str());
+        IDS_EXTENSION_INSTALLED_PAGE_ACTION_INFO).c_str());
     gtk_label_set_line_wrap(GTK_LABEL(info_label), TRUE);
     gtk_widget_set_size_request(info_label, kTextColumnWidth, -1);
     gtk_box_pack_start(GTK_BOX(text_column), info_label, FALSE, FALSE, 0);
+  }
+
+  // Omnibox keyword label
+  if (type_ == OMNIBOX_KEYWORD) {
+    GtkWidget* info_label = gtk_label_new(l10n_util::GetStringFUTF8(
+        IDS_EXTENSION_INSTALLED_OMNIBOX_KEYWORD_INFO,
+        UTF8ToUTF16(extension_->omnibox_keyword())).c_str());
+    gtk_label_set_line_wrap(GTK_LABEL(info_label), TRUE);
+    gtk_widget_set_size_request(info_label, kTextColumnWidth, -1);
+    gtk_box_pack_start(GTK_BOX(text_column), info_label, FALSE, FALSE, 0);
   }
 
   // Manage label
   GtkWidget* manage_label = gtk_label_new(
       l10n_util::GetStringUTF8(IDS_EXTENSION_INSTALLED_MANAGE_INFO).c_str());
   gtk_label_set_line_wrap(GTK_LABEL(manage_label), TRUE);
   gtk_widget_set_size_request(manage_label, kTextColumnWidth, -1);
   gtk_box_pack_start(GTK_BOX(text_column), manage_label, FALSE, FALSE, 0);
 
   // Create and pack the close button.
   GtkWidget* close_column = gtk_vbox_new(FALSE, 0);
   gtk_box_pack_start(GTK_BOX(bubble_content), close_column, FALSE, FALSE, 0);
   close_button_.reset(CustomDrawButton::CloseButton(theme_provider));
   g_signal_connect(close_button_->widget(), "clicked",
                    G_CALLBACK(OnButtonClick), this);
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   close_button_->SetBackground(
       theme_provider->GetColor(BrowserThemeProvider::COLOR_TAB_TEXT),
       rb.GetBitmapNamed(IDR_CLOSE_BAR),
       rb.GetBitmapNamed(IDR_CLOSE_BAR_MASK));
   gtk_box_pack_start(GTK_BOX(close_column), close_button_->widget(),
       FALSE, FALSE, 0);
 
   InfoBubbleGtk::ArrowLocationGtk arrow_location =
       !base::i18n::IsRTL() ?
       InfoBubbleGtk::ARROW_LOCATION_TOP_RIGHT :
       InfoBubbleGtk::ARROW_LOCATION_TOP_LEFT;
+
+  gfx::Rect bounds = gtk_util::WidgetBounds(reference_widget);
+  if (type_ == OMNIBOX_KEYWORD) {
+    // Reverse the arrow for omnibox keywords, since the bubble will be on the
+    // other side of the window. We also clear the width to avoid centering
+    // the popup on the URL bar.
+    arrow_location =
+        !base::i18n::IsRTL() ?
+        InfoBubbleGtk::ARROW_LOCATION_TOP_LEFT :
+        InfoBubbleGtk::ARROW_LOCATION_TOP_RIGHT;
+    bounds.set_width(0);

[Aaron Boodman, 2010/11/11 02:55:30]

Do you have a screenshot of what this ends up looking like?

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

I attached screenshots of the Windows UI to the bug, but in the process
discovered RTL is broken under linux. Working on a fix.

+  }
+
   info_bubble_ = InfoBubbleGtk::Show(reference_widget,
-      NULL,
+      &bounds,
       bubble_content,
       arrow_location,
       true,  // match_system_theme
       true,  // grab_input
       theme_provider,
       this);
 }
 
 // static
 void ExtensionInstalledBubbleGtk::OnButtonClick(GtkWidget* button,
@@ skipping 22 matching lines @@
   // the window before we call Release() because close_button_ depends
   // on all references being cleared before it is destroyed.
   MessageLoopForUI::current()->PostTask(FROM_HERE, NewRunnableMethod(this,
       &ExtensionInstalledBubbleGtk::Close));
 }
 
 void ExtensionInstalledBubbleGtk::Close() {
   Release();  // Balanced in ctor.
   info_bubble_ = NULL;
 }