Implement window open disposition for (some) navigation buttons....

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 "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/base_paths_linux.h"
 #include "base/path_service.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/gtk/back_forward_button_gtk.h"
 #include "chrome/browser/gtk/browser_window_gtk.h"
 #include "chrome/browser/gtk/custom_button.h"
 #include "chrome/browser/gtk/go_button_gtk.h"
 #include "chrome/browser/gtk/gtk_chrome_button.h"
 #include "chrome/browser/gtk/location_bar_view_gtk.h"
 #include "chrome/browser/gtk/nine_box.h"
 #include "chrome/browser/gtk/standard_menus.h"
 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h"
 #include "chrome/browser/gtk/toolbar_star_toggle_gtk.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profile.h"
+#include "chrome/common/gtk_util.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 
 namespace {
 
@@ skipping 17 matching lines @@
 // BrowserToolbarGtk, public ---------------------------------------------------
 
 BrowserToolbarGtk::BrowserToolbarGtk(Browser* browser, BrowserWindowGtk* window)
     : toolbar_(NULL),
       location_bar_(new LocationBarViewGtk(browser->command_updater(),
                                            browser->toolbar_model(),
                                            this)),
       model_(browser->toolbar_model()),
       browser_(browser),
       window_(window),
-      profile_(NULL) {
+      profile_(NULL),
+      last_release_event_flags_(0) {
   browser_->command_updater()->AddCommandObserver(IDC_BACK, this);
   browser_->command_updater()->AddCommandObserver(IDC_FORWARD, this);
   browser_->command_updater()->AddCommandObserver(IDC_RELOAD, this);
   browser_->command_updater()->AddCommandObserver(IDC_HOME, this);
   browser_->command_updater()->AddCommandObserver(IDC_STAR, this);
 
   InitNineBox();
 }
 
 BrowserToolbarGtk::~BrowserToolbarGtk() {
@@ skipping 46 matching lines @@
   gtk_box_pack_start(GTK_BOX(toolbar_), back_forward_hbox_, FALSE, FALSE, 0);
 
   reload_.reset(BuildToolbarButton(IDR_RELOAD, IDR_RELOAD_P, IDR_RELOAD_H, 0,
       l10n_util::GetStringUTF8(IDS_TOOLTIP_RELOAD)));
   AddAcceleratorToButton(reload_->widget(), GDK_r, GDK_CONTROL_MASK);
   AddAcceleratorToButton(reload_->widget(), GDK_F5, GdkModifierType(0));
   AddAcceleratorToButton(reload_->widget(), GDK_F5, GDK_CONTROL_MASK);
 
   home_.reset(BuildToolbarButton(IDR_HOME, IDR_HOME_P, IDR_HOME_H, 0,
                                  l10n_util::GetStringUTF8(IDS_TOOLTIP_HOME)));
+  gtk_util::SetButtonTriggersNavigation(home_->widget());
 
   // Group the start, omnibox, and go button into an hbox.
   GtkWidget* omnibox_hbox_ = gtk_hbox_new(FALSE, 0);
   star_.reset(BuildStarButton(l10n_util::GetStringUTF8(IDS_TOOLTIP_STAR)));
   gtk_box_pack_start(GTK_BOX(omnibox_hbox_), star_->widget(), FALSE, FALSE, 0);
 
   location_bar_->Init();
   gtk_box_pack_start(GTK_BOX(omnibox_hbox_), location_bar_->widget(), TRUE,
                      TRUE, 0);
 
@@ skipping 155 matching lines @@
 CustomDrawButton* BrowserToolbarGtk::BuildToolbarButton(
     int normal_id, int active_id, int highlight_id, int depressed_id,
     const std::string& localized_tooltip) {
   CustomDrawButton* button = new CustomDrawButton(normal_id, active_id,
       highlight_id, depressed_id);
 
   gtk_widget_set_tooltip_text(button->widget(),
                               localized_tooltip.c_str());
   g_signal_connect(button->widget(), "clicked",
                    G_CALLBACK(OnButtonClick), this);
+  g_signal_connect(button->widget(), "button-release-event",
+                   G_CALLBACK(OnButtonRelease), this);
 
   gtk_box_pack_start(GTK_BOX(toolbar_), button->widget(), FALSE, FALSE, 0);
   return button;
 }
 
 ToolbarStarToggleGtk* BrowserToolbarGtk::BuildStarButton(
     const std::string& localized_tooltip) {
   ToolbarStarToggleGtk* button = new ToolbarStarToggleGtk(this);
 
   gtk_widget_set_tooltip_text(button->widget(),
@@ skipping 48 matching lines @@
 void BrowserToolbarGtk::OnButtonClick(GtkWidget* button,
                                       BrowserToolbarGtk* toolbar) {
   int tag = -1;
   if (button == toolbar->reload_->widget())
     tag = IDC_RELOAD;
   else if (toolbar->home_.get() && button == toolbar->home_->widget())
     tag = IDC_HOME;
   else if (button == toolbar->star_->widget())
     tag = IDC_STAR;
 
-  DCHECK_NE(tag, -1) << "Impossible button click callback";
-  toolbar->browser_->ExecuteCommand(tag);
+  DCHECK_NE(tag, -1) << "Unexpected button click callback";
+  toolbar->browser_->ExecuteCommandWithDisposition(tag,
+      event_utils::DispositionFromEventFlags(
+          toolbar->last_release_event_flags_));
+}
+
+// static
+gboolean BrowserToolbarGtk::OnButtonRelease(GtkWidget* button,
+                                            GdkEventButton* event,
+                                            BrowserToolbarGtk* toolbar) {
+  toolbar->last_release_event_flags_ = event->state;
+  return FALSE;
 }
 
 // static
 gboolean BrowserToolbarGtk::OnMenuButtonPressEvent(GtkWidget* button,
                                                    GdkEventButton* event,
                                                    BrowserToolbarGtk* toolbar) {
   if (event->button != 1)
     return FALSE;
 
   gtk_chrome_button_set_paint_state(GTK_CHROME_BUTTON(button),
@@ skipping 13 matching lines @@
       widget, "clicked", accel_group_, accelerator,
       GdkModifierType(accelerator_mod), GtkAccelFlags(0));
 }
 
 void BrowserToolbarGtk::InitNineBox() {
   // TODO(estade): use |profile_|?
   background_ninebox_.reset(new NineBox(
       browser_->profile()->GetThemeProvider(),
       0, IDR_THEME_TOOLBAR, 0, 0, 0, 0, 0, 0, 0));
 }