Make the reload button respond to middle-clicks like back/forward/home alread...

chrome/browser/gtk/browser_toolbar_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/browser_toolbar_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include <X11/XF86keysym.h>
 
@@ skipping 681 matching lines @@
   if (theme_provider_->UseGtkTheme()) {
     gtk_util::DrawTextEntryBackground(offscreen_entry_.get(),
                                       location_hbox, &e->area,
                                       &location_hbox->allocation);
   }
 
   return FALSE;
 }
 
 void BrowserToolbarGtk::OnButtonClick(GtkWidget* button) {
-  if ((button == back_->widget()) ||
-      (button == forward_->widget())) {
-    location_bar_->Revert();
+  if ((button == back_->widget()) || (button == forward_->widget())) {
+    if (gtk_util::DispositionForCurrentButtonPressEvent() == CURRENT_TAB)
+      location_bar_->Revert();
     return;
   }
 
-  int tag = -1;
+  int command = -1;
+  GdkModifierType modifier_state;
+  gtk_get_current_event_state(&modifier_state);
+  guint modifier_state_uint = modifier_state;
   if (button == reload_->widget()) {
-    GdkModifierType modifier_state;
-    if (gtk_get_current_event_state(&modifier_state) &&
-        modifier_state & GDK_SHIFT_MASK) {
-      tag = IDC_RELOAD_IGNORING_CACHE;
+    if (modifier_state_uint & GDK_SHIFT_MASK) {
+      command = IDC_RELOAD_IGNORING_CACHE;
+      // Mask off shift so it isn't interpreted as affecting the disposition
+      // below.
+      modifier_state_uint &= ~GDK_SHIFT_MASK;
     } else {
-      tag = IDC_RELOAD;
+      command = IDC_RELOAD;
     }
-    location_bar_->Revert();
+    if (event_utils::DispositionFromEventFlags(modifier_state_uint) ==
+        CURRENT_TAB)
+      location_bar_->Revert();
   } else if (home_.get() && button == home_->widget()) {
-    tag = IDC_HOME;
+    command = IDC_HOME;
   }
 
-  DCHECK_NE(tag, -1) << "Unexpected button click callback";
-  browser_->ExecuteCommandWithDisposition(tag,
-      gtk_util::DispositionForCurrentButtonPressEvent());
+  DCHECK_NE(command, -1) << "Unexpected button click callback";
+  browser_->ExecuteCommandWithDisposition(command,
+      event_utils::DispositionFromEventFlags(modifier_state_uint));
 }
 
 gboolean BrowserToolbarGtk::OnMenuButtonPressEvent(GtkWidget* button,
                                                    GdkEventButton* event) {
   if (event->button != 1)
     return FALSE;
 
   gtk_chrome_button_set_paint_state(GTK_CHROME_BUTTON(button),
                                     GTK_STATE_ACTIVE);
   MenuGtk* menu = button == page_menu_button_.get() ?
@@ skipping 109 matching lines @@
   int x_offset = base::i18n::IsRTL() ?
       sender->allocation.width - kUpgradeDotOffset - badge.width() :
       kUpgradeDotOffset;
   canvas.DrawBitmapInt(
       badge,
       sender->allocation.x + x_offset,
       sender->allocation.y + sender->allocation.height - badge.height());
 
   return FALSE;
 }