Merge 37725 - GTK: Make page and app menus shortcut control flow match window...

chrome/browser/gtk/browser_toolbar_gtk.cc

 // Copyright (c) 2009 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/browser_toolbar_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include <X11/XF86keysym.h>
 
@@ skipping 208 matching lines @@
   menu_bar_helper_.Add(app_menu_button_.get());
   app_menu_image_ = gtk_image_new_from_pixbuf(
       theme_provider_->GetRTLEnabledPixbufNamed(IDR_MENU_CHROME));
   gtk_container_add(GTK_CONTAINER(chrome_menu), app_menu_image_);
 
   app_menu_.reset(new MenuGtk(this, &app_menu_model_));
   gtk_box_pack_start(GTK_BOX(menus_hbox_), chrome_menu, FALSE, FALSE, 0);
 
   gtk_box_pack_start(GTK_BOX(toolbar_), menus_hbox_, FALSE, FALSE, 0);
 
-  // Page and app menu accelerators.
-  GtkAccelGroup* accel_group = gtk_accel_group_new();
-  gtk_window_add_accel_group(top_level_window, accel_group);
-  // Drop the initial ref on |accel_group| so |window_| will own it.
-  g_object_unref(accel_group);
-  // I would use "popup-menu" here, but GTK complains. I would use "activate",
-  // but the docs say never to connect to that signal.
-  gtk_widget_add_accelerator(page_menu, "clicked", accel_group,
-                             GDK_e, GDK_MOD1_MASK,
-                             static_cast<GtkAccelFlags>(0));
-  gtk_widget_add_accelerator(chrome_menu, "clicked", accel_group,
-                             GDK_f, GDK_MOD1_MASK,
-                             static_cast<GtkAccelFlags>(0));
-
   if (ShouldOnlyShowLocation()) {
     gtk_widget_show(event_box_);
     gtk_widget_show(alignment_);
     gtk_widget_show(toolbar_);
     gtk_widget_show_all(location_hbox);
     gtk_widget_hide(star_->widget());
     gtk_widget_hide(go_->widget());
   } else {
     gtk_widget_show_all(event_box_);
 
@@ skipping 40 matching lines @@
 }
 
 void BrowserToolbarGtk::UpdateForBookmarkBarVisibility(
     bool show_bottom_padding) {
   gtk_alignment_set_padding(GTK_ALIGNMENT(alignment_),
       ShouldOnlyShowLocation() ? 0 : kTopPadding,
       !show_bottom_padding || ShouldOnlyShowLocation() ? 0 : kTopPadding,
       kLeftRightPadding, kLeftRightPadding);
 }
 
+void BrowserToolbarGtk::ShowPageMenu() {
+  PopupForButton(page_menu_button_.get());
+}
+
+void BrowserToolbarGtk::ShowAppMenu() {
+  PopupForButton(app_menu_button_.get());
+}
+
 // CommandUpdater::CommandObserver ---------------------------------------------
 
 void BrowserToolbarGtk::EnabledStateChangedForCommand(int id, bool enabled) {
   GtkWidget* widget = NULL;
   switch (id) {
     case IDC_BACK:
       widget = back_->widget();
       break;
     case IDC_FORWARD:
       widget = forward_->widget();
@@ skipping 192 matching lines @@
 
 GtkWidget* BrowserToolbarGtk::BuildToolbarMenuButton(
     const std::string& localized_tooltip,
     OwnedWidgetGtk* owner) {
   GtkWidget* button = theme_provider_->BuildChromeButton();
   owner->Own(button);
 
   gtk_widget_set_tooltip_text(button, localized_tooltip.c_str());
   g_signal_connect(button, "button-press-event",
                    G_CALLBACK(OnMenuButtonPressEvent), this);
-  g_signal_connect(button, "clicked",
-                   G_CALLBACK(OnMenuClicked), this);
   GTK_WIDGET_UNSET_FLAGS(button, GTK_CAN_FOCUS);
 
   return button;
 }
 
 void BrowserToolbarGtk::SetUpDragForHomeButton() {
   gtk_drag_dest_set(home_->widget(), GTK_DEST_DEFAULT_ALL,
                     NULL, 0, GDK_ACTION_COPY);
   static const int targets[] = { GtkDndUtil::TEXT_PLAIN,
                                  GtkDndUtil::TEXT_URI_LIST, -1 };
@@ skipping 128 matching lines @@
                                     GTK_STATE_ACTIVE);
   MenuGtk* menu = button == toolbar->page_menu_button_.get() ?
                   toolbar->page_menu_.get() : toolbar->app_menu_.get();
   menu->Popup(button, reinterpret_cast<GdkEvent*>(event));
   toolbar->menu_bar_helper_.MenuStartedShowing(button, menu->widget());
 
   return TRUE;
 }
 
 // static
-gboolean BrowserToolbarGtk::OnMenuClicked(GtkWidget* button,
-                                          BrowserToolbarGtk* toolbar) {
-  toolbar->PopupForButton(button);
-
-  return TRUE;
-}
-
-// static
 void BrowserToolbarGtk::OnDragDataReceived(GtkWidget* widget,
     GdkDragContext* drag_context, gint x, gint y,
     GtkSelectionData* data, guint info, guint time,
     BrowserToolbarGtk* toolbar) {
   if (info != GtkDndUtil::TEXT_PLAIN) {
     NOTIMPLEMENTED() << "Only support plain text drops for now, sorry!";
     return;
   }
 
   GURL url(reinterpret_cast<char*>(data->data));
@@ skipping 50 matching lines @@
   menu->PopupAsFromKeyEvent(button);
   menu_bar_helper_.MenuStartedShowing(button, menu->widget());
 }
 
 void BrowserToolbarGtk::PopupForButtonNextTo(GtkWidget* button,
                                              GtkMenuDirectionType dir) {
   GtkWidget* other_button = button == page_menu_button_.get() ?
       app_menu_button_.get() : page_menu_button_.get();
   PopupForButton(other_button);
 }