Disable the stop button when the user is hovering it and the page finishes lo...

chrome/browser/views/reload_button.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/reload_button.h"
 
 #include "app/l10n_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/views/event_utils.h"
@@ skipping 14 matching lines @@
 
 ReloadButton::~ReloadButton() {
 }
 
 void ReloadButton::ChangeMode(Mode mode, bool force) {
   intended_mode_ = mode;
 
   // If the change is forced, or the user isn't hovering the icon, or it's safe
   // to change it to the other image type, make the change immediately;
   // otherwise we'll let it happen later.
-  if (force || (state() != BS_HOT) || ((mode == MODE_STOP) ?
+  if (force || !IsMouseHovered() || ((mode == MODE_STOP) ?
       !timer_.IsRunning() : (visible_mode_ != MODE_STOP))) {
     timer_.Stop();
     SetToggled(mode == MODE_STOP);
     visible_mode_ = mode;
+    SetEnabled(true);
+
+  // We want to disable the button if we're preventing a change from stop to
+  // reload due to hovering, but not if we're preventing a change from reload to
+  // stop due to the timer running.  (There is no disabled reload state.)
+  } else if (visible_mode_ != MODE_RELOAD) {
+    SetEnabled(false);
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ReloadButton, views::ButtonListener implementation:
 
 void ReloadButton::ButtonPressed(views::Button* button,
                                  const views::Event& event) {
   if (visible_mode_ == MODE_STOP) {
     browser_->Stop();
@@ skipping 17 matching lines @@
 
     WindowOpenDisposition disposition =
         event_utils::DispositionFromEventFlags(flags);
     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(command, disposition);
-
-    // Stop the timer.
-    timer_.Stop();
-
     // Start a timer - while this timer is running, the reload button cannot be
     // changed to a stop button.  We do not set |intended_mode_| to MODE_STOP
-    // here as we want to wait for the browser to tell us that it has started
-    // loading (and this may occur only after some delay).
+    // here as the browser will do that when it actually starts loading (which
+    // may happen synchronously, thus the need to do this before telling the
+    // browser to execute the reload command).
+    timer_.Stop();
     timer_.Start(base::TimeDelta::FromMilliseconds(GetDoubleClickTimeMS()),
                  this, &ReloadButton::OnButtonTimer);
+
+    browser_->ExecuteCommandWithDisposition(command, disposition);
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ReloadButton, View overrides:
 
 void ReloadButton::OnMouseExited(const views::MouseEvent& e) {
   ChangeMode(intended_mode_, true);
   if (state() != BS_DISABLED)
     SetState(BS_NORMAL);
 }
 
 bool ReloadButton::GetTooltipText(const gfx::Point& p, std::wstring* tooltip) {
   tooltip->assign(l10n_util::GetString((visible_mode_ == MODE_RELOAD) ?
       IDS_TOOLTIP_RELOAD : IDS_TOOLTIP_STOP));
   return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ReloadButton, private:
 
 void ReloadButton::OnButtonTimer() {
-  ChangeMode(intended_mode_, true);
+  ChangeMode(intended_mode_, false);
 }