summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa/browser_window_controller.mm
diff options
context:
space:
mode:
authorshess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-07 22:20:14 +0000
committershess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-07 22:20:14 +0000
commit35b1eb2a2e8bca7732421539e9094813fc7e77e2 (patch)
tree7145b80fb0892e45a5eb8737833f63cabad6a0b9 /chrome/browser/cocoa/browser_window_controller.mm
parent9281f8359ca7e19cb067ca9e4995ff158252f44c (diff)
downloadchromium_src-35b1eb2a2e8bca7732421539e9094813fc7e77e2.zip
chromium_src-35b1eb2a2e8bca7732421539e9094813fc7e77e2.tar.gz
chromium_src-35b1eb2a2e8bca7732421539e9094813fc7e77e2.tar.bz2
[Mac] Don't change state from stop to reload when hovered.
Hold the reload button state change from stop to reload until the mouse exits. Also short-circuit the stop message when the real state should be reload. Also prevent multi-clicks from sending multiple actions. Toolbar.xib: reload button made kind of ReloadButton. BUG=47184 TEST=Browse to a slow page, mouse over stop button. Should not go to reload button when throbber (in tab) stops. TEST=After page loaded, click stop. Should not crash. TEST=Hover over reload button. Command-r should start a reload and change the button to stop button. Review URL: http://codereview.chromium.org/2847051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51787 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/browser_window_controller.mm')
-rw-r--r--chrome/browser/cocoa/browser_window_controller.mm4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/browser_window_controller.mm b/chrome/browser/cocoa/browser_window_controller.mm
index 96b0245..aa7b325 100644
--- a/chrome/browser/cocoa/browser_window_controller.mm
+++ b/chrome/browser/cocoa/browser_window_controller.mm
@@ -1104,8 +1104,8 @@
return [tabStripController_ selectedTabView];
}
-- (void)setIsLoading:(BOOL)isLoading {
- [toolbarController_ setIsLoading:isLoading];
+- (void)setIsLoading:(BOOL)isLoading force:(BOOL)force {
+ [toolbarController_ setIsLoading:isLoading force:force];
}
// Make the location bar the first responder, if possible.