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

chrome/browser/views/toolbar_view.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/views/toolbar_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "chrome/app/chrome_dll_resource.h"
@@ skipping 69 matching lines @@
       bookmark_menu_(NULL),
       profile_(NULL),
       browser_(browser),
       profiles_menu_contents_(NULL),
       last_focused_view_storage_id_(-1),
       menu_bar_emulation_mode_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),
       destroyed_flag_(NULL),
       collapsed_(false) {
   SetID(VIEW_ID_TOOLBAR);
+
   browser_->command_updater()->AddCommandObserver(IDC_BACK, this);
   browser_->command_updater()->AddCommandObserver(IDC_FORWARD, this);
   browser_->command_updater()->AddCommandObserver(IDC_HOME, this);
   browser_->command_updater()->AddCommandObserver(IDC_RELOAD, this);
 
   display_mode_ = browser->SupportsWindowFeature(Browser::FEATURE_TABSTRIP) ?
       DISPLAYMODE_NORMAL : DISPLAYMODE_LOCATION;
 
   if (!kPopupBackgroundEdge) {
     kPopupBackgroundEdge = ResourceBundle::GetSharedInstance().GetBitmapNamed(
@@ skipping 46 matching lines @@
 
   home_ = new views::ImageButton(this);
   home_->set_triggerable_event_flags(views::Event::EF_LEFT_BUTTON_DOWN |
                                      views::Event::EF_MIDDLE_BUTTON_DOWN);
   home_->set_tag(IDC_HOME);
   home_->SetTooltipText(l10n_util::GetString(IDS_TOOLTIP_HOME));
   home_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_HOME));
   home_->SetID(VIEW_ID_HOME_BUTTON);
 
   reload_ = new views::ImageButton(this);
+  reload_->set_triggerable_event_flags(views::Event::EF_LEFT_BUTTON_DOWN |
+                                       views::Event::EF_MIDDLE_BUTTON_DOWN);
   reload_->set_tag(IDC_RELOAD);
   reload_->SetTooltipText(l10n_util::GetString(IDS_TOOLTIP_RELOAD));
   reload_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_RELOAD));
   reload_->SetID(VIEW_ID_RELOAD_BUTTON);
 
   location_bar_ = new LocationBarView(profile, browser_->command_updater(),
       model_, this, (display_mode_ == DISPLAYMODE_LOCATION) ?
           LocationBarView::POPUP : LocationBarView::NORMAL);
   location_bar_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_LOCATION));
 
@@ skipping 230 matching lines @@
   }
   if (button)
     button->SetEnabled(enabled);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, views::Button::ButtonListener implementation:
 
 void ToolbarView::ButtonPressed(views::Button* sender,
                                 const views::Event& event) {
-  int id = sender->tag();
-  switch (id) {
+  int command = sender->tag();
+  int flags = sender->mouse_event_flags();
+  // Shift-clicking or Ctrl-clicking the reload button means we should ignore
+  // any cached content.
+  // TODO(avayvod): eliminate duplication of this logic in
+  // CompactLocationBarView.
+  if ((command == IDC_RELOAD) &&
+      (event.IsShiftDown() || event.IsControlDown())) {
+    command = IDC_RELOAD_IGNORING_CACHE;
+    // Mask off shift/ctrl so they aren't interpreted as affecting the
+    // disposition below.
+    flags &= ~(views::Event::EF_SHIFT_DOWN | views::Event::EF_CONTROL_DOWN);
+  }
+  WindowOpenDisposition disposition =
+      event_utils::DispositionFromEventFlags(flags);
+  switch (command) {
     case IDC_BACK:
     case IDC_FORWARD:
     case IDC_RELOAD:
-      // Forcibly reset the location bar, since otherwise it won't discard any
-      // ongoing user edits, since it doesn't realize this is a user-initiated
-      // action.
-      location_bar_->Revert();
-      // Shift-clicking or Ctrl-clicking the reload button means we should
-      // ignore any cached content.
-      // TODO(avayvod): eliminate duplication of this logic in
-      // CompactLocationBarView.
-      if (id == IDC_RELOAD && (event.IsShiftDown() || event.IsControlDown()))
-        id = IDC_RELOAD_IGNORING_CACHE;
-      break;
+    case IDC_RELOAD_IGNORING_CACHE:
+      if (disposition == CURRENT_TAB) {
+        // Forcibly reset the location bar, since otherwise it won't discard any
+        // ongoing user edits, since it doesn't realize this is a user-initiated
+        // action.
+        location_bar_->Revert();
+      }
   }
-  browser_->ExecuteCommandWithDisposition(
-      id, event_utils::DispositionFromEventFlags(sender->mouse_event_flags()));
+  browser_->ExecuteCommandWithDisposition(command, disposition);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, NotificationObserver implementation:
 
 void ToolbarView::Observe(NotificationType type,
                           const NotificationSource& source,
                           const NotificationDetails& details) {
   if (type == NotificationType::PREF_CHANGED) {
     std::wstring* pref_name = Details<std::wstring>(details).ptr();
@@ skipping 470 matching lines @@
     last_focused_view->RequestFocus();
   } else {
     // Focus the location bar
     views::View* view = GetAncestorWithClassName(BrowserView::kViewClassName);
     if (view) {
       BrowserView* browser_view = static_cast<BrowserView*>(view);
       browser_view->SetFocusToLocationBar(false);
     }
   }
 }