Display action box menu on Linux/gtk.

chrome/browser/ui/gtk/location_bar_view_gtk.cc

 // Copyright (c) 2012 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/ui/gtk/location_bar_view_gtk.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 368 matching lines @@
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // LocationBarViewGtk
 
 // static
 const GdkColor LocationBarViewGtk::kBackgroundColor =
     GDK_COLOR_RGB(255, 255, 255);
 
+class LocationBarViewGtk::ShowStarBubbleAction {

[Evan Stade, 2012/08/30 22:32:25]

I'd just use a pair. At the very least it should be a struct, and defined in the
header file.

The other option would be to create a base::Closure on the spot, then choose to
fire it now or save it for later.

+ public:
+  ShowStarBubbleAction(GURL url, bool newly_bookmarked);
+
+  GURL url_;
+  bool newly_bookmarked_;
+};
+
+LocationBarViewGtk::ShowStarBubbleAction::ShowStarBubbleAction(
+  GURL url,
+  bool newly_bookmarked)
+    : url_(url), newly_bookmarked_(newly_bookmarked) {}
+
 LocationBarViewGtk::LocationBarViewGtk(Browser* browser)
     : zoom_image_(NULL),
       star_image_(NULL),
       starred_(false),
+      star_sized_(false),
       site_type_alignment_(NULL),
       site_type_event_box_(NULL),
       location_icon_image_(NULL),
       drag_icon_(NULL),
       enable_location_drag_(false),
       security_info_label_(NULL),
       web_intents_button_view_(new WebIntentsButtonViewGtk(this)),
       tab_to_search_alignment_(NULL),
       tab_to_search_box_(NULL),
       tab_to_search_full_label_(NULL),
@@ skipping 147 matching lines @@
     // This offset corrects the strange offset of CustomDrawButton.
     const int kMagicActionBoxYOffset = 3;
     GtkWidget* alignment = gtk_alignment_new(0, 0, 1, 1);
     gtk_alignment_set_padding(GTK_ALIGNMENT(alignment),
                               0, kMagicActionBoxYOffset,
                               0, kInnerPadding);
     gtk_container_add(GTK_CONTAINER(alignment), action_box_button_->widget());
 
     gtk_box_pack_end(GTK_BOX(hbox_.get()), alignment,
                      FALSE, FALSE, 0);
-  } else if (browser_defaults::bookmarks_enabled && !ShouldOnlyShowLocation()) {
+  }
+
+  if (browser_defaults::bookmarks_enabled && !ShouldOnlyShowLocation()) {
     // Hide the star icon in popups, app windows, etc.
     CreateStarButton();
     gtk_box_pack_end(GTK_BOX(hbox_.get()), star_.get(), FALSE, FALSE, 0);
   }
 
   CreateZoomButton();
   gtk_box_pack_end(GTK_BOX(hbox_.get()), zoom_.get(), FALSE, FALSE, 0);
 
   content_setting_hbox_.Own(gtk_hbox_new(FALSE, kInnerPadding + 1));
   gtk_widget_set_name(content_setting_hbox_.get(),
@@ skipping 264 matching lines @@
                              0,
                              OnZoomButtonPressThunk));
 }
 
 void LocationBarViewGtk::CreateStarButton() {
   star_.Own(CreateIconButton(&star_image_,
                              0,
                              VIEW_ID_STAR_BUTTON,
                              IDS_TOOLTIP_STAR,
                              OnStarButtonPressThunk));
+  // We need to track when the star button is resized to show any bubble
+  // attached to it at this time.
+  g_signal_connect(star_image_, "size-allocate",
+                   G_CALLBACK(&OnStarButtonSizeAllocateThunk), this);
 }
 
 void LocationBarViewGtk::OnInputInProgress(bool in_progress) {
   // This is identical to the Windows code, except that we don't proxy the call
   // back through the Toolbar, and just access the model here.
   // The edit should make sure we're only notified when something changes.
   DCHECK(toolbar_model_->input_in_progress() != in_progress);
 
   toolbar_model_->set_input_in_progress(in_progress);
   Update(NULL);
@@ skipping 597 matching lines @@
                                                GdkEventButton* event) {
   if (event->button == 1 && GetWebContents()) {
     // If the zoom icon is clicked, show the zoom bubble and keep it open until
     // it loses focus.
     ZoomBubbleGtk::Show(zoom_.get(), GetTabContents(), false);
     return TRUE;
   }
   return FALSE;
 }
 
+void LocationBarViewGtk::OnStarButtonSizeAllocate(GtkWidget* sender,
+                                                  GtkAllocation* allocation) {
+  if (show_star_bubble_action_.get()) {
+    BookmarkBubbleGtk::Show(star_.get(), browser_->profile(),
+                            show_star_bubble_action_->url_,
+                            show_star_bubble_action_->newly_bookmarked_);
+    show_star_bubble_action_.reset();
+  }
+  star_sized_ = true;
+}
+
 gboolean LocationBarViewGtk::OnStarButtonPress(GtkWidget* widget,
                                                GdkEventButton* event) {
   if (event->button == 1) {
     chrome::ExecuteCommand(browser_, IDC_BOOKMARK_PAGE);
     return TRUE;
   }
   return FALSE;
 }
 
 void LocationBarViewGtk::ShowZoomBubble() {
   if (!zoom_.get() || toolbar_model_->input_in_progress())
     return;
 
   ZoomBubbleGtk::Show(zoom_.get(), GetTabContents(), true);
 }
 
 void LocationBarViewGtk::ShowStarBubble(const GURL& url,
                                         bool newly_bookmarked) {
   if (!star_.get())
     return;
 
-  BookmarkBubbleGtk::Show(star_.get(), browser_->profile(), url,
-                          newly_bookmarked);
+  if (star_sized_)

[Evan Stade, 2012/08/30 22:32:25]

curlies

[beaudoin, 2012/08/31 13:27:09]

Done.

+    BookmarkBubbleGtk::Show(star_.get(), browser_->profile(), url,
+                            newly_bookmarked);
+  else
+    show_star_bubble_action_.reset(
+        new ShowStarBubbleAction(url, newly_bookmarked));
 }
 
 void LocationBarViewGtk::ShowChromeToMobileBubble() {
   // TODO(msw): Chrome to Mobile is currently disabled on GTK.
   // ChromeToMobileBubbleGtk::Show(GTK_WIDGET(action_box_button_->widget()),
   //                               browser_);
 }
 
 void LocationBarViewGtk::SetStarred(bool starred) {
   if (starred == starred_)
@@ skipping 30 matching lines @@
   string16 tooltip = l10n_util::GetStringFUTF16Int(
       IDS_TOOLTIP_ZOOM, zoom_controller->zoom_percent());
   gtk_widget_set_tooltip_text(zoom_.get(), UTF16ToUTF8(tooltip).c_str());
 
   gtk_widget_show(zoom_.get());
 }
 
 void LocationBarViewGtk::UpdateStarIcon() {
   if (!star_.get())
     return;
+  // Indicate the star icon is not correctly sized. It will be marked as sized
+  // when the next size-allocate signal is received by the star widget.
+  star_sized_ = false;
   bool star_enabled = !toolbar_model_->input_in_progress() &&
                       edit_bookmarks_enabled_.GetValue();
   command_updater_->UpdateCommandEnabled(IDC_BOOKMARK_PAGE, star_enabled);
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableActionBox) &&
+      !starred_)

[Evan Stade, 2012/08/30 22:32:25]

curlies

[beaudoin, 2012/08/31 13:27:09]

Done.

+    star_enabled = false;
   if (star_enabled) {
     gtk_widget_show_all(star_.get());
     int id = starred_ ? IDR_STAR_LIT : IDR_STAR;
-    gtk_image_set_from_pixbuf(
-        GTK_IMAGE(star_image_),
-        theme_service_->GetImageNamed(id)->ToGdkPixbuf());
+    gtk_image_set_from_pixbuf(GTK_IMAGE(star_image_),
+                              theme_service_->GetImageNamed(id)->ToGdkPixbuf());
   } else {
     gtk_widget_hide_all(star_.get());
   }
 }
 
 bool LocationBarViewGtk::ShouldOnlyShowLocation() {
   return !browser_->is_type_tabbed();
 }
 
 void LocationBarViewGtk::AdjustChildrenVisibility() {
@@ skipping 529 matching lines @@
 }
 
 void LocationBarViewGtk::PageActionViewGtk::InspectPopup(
     ExtensionAction* action) {
   ExtensionPopupGtk::Show(
       action->GetPopupUrl(current_tab_id_),
       owner_->browser_,
       event_box_.get(),
       ExtensionPopupGtk::SHOW_AND_INSPECT);
 }