diff options
| author | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-07 22:20:14 +0000 |
|---|---|---|
| committer | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-07 22:20:14 +0000 |
| commit | 35b1eb2a2e8bca7732421539e9094813fc7e77e2 (patch) | |
| tree | 7145b80fb0892e45a5eb8737833f63cabad6a0b9 /chrome/browser/cocoa/toolbar_controller.mm | |
| parent | 9281f8359ca7e19cb067ca9e4995ff158252f44c (diff) | |
| download | chromium_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/toolbar_controller.mm')
| -rw-r--r-- | chrome/browser/cocoa/toolbar_controller.mm | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/chrome/browser/cocoa/toolbar_controller.mm b/chrome/browser/cocoa/toolbar_controller.mm index 4823f31..7487241 100644 --- a/chrome/browser/cocoa/toolbar_controller.mm +++ b/chrome/browser/cocoa/toolbar_controller.mm @@ -29,6 +29,7 @@ #import "chrome/browser/cocoa/location_bar/location_bar_view_mac.h" #import "chrome/browser/cocoa/menu_button.h" #import "chrome/browser/cocoa/menu_controller.h" +#import "chrome/browser/cocoa/reload_button.h" #import "chrome/browser/cocoa/toolbar_view.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/pref_service.h" @@ -412,16 +413,8 @@ class PrefObserverBridge : public NotificationObserver { locationBarView_->SetStarred(isStarred ? true : false); } -- (void)setIsLoading:(BOOL)isLoading { - NSString* imageName = kReloadButtonReloadImageName; - NSInteger tag = IDC_RELOAD; - if (isLoading) { - imageName = kReloadButtonStopImageName; - tag = IDC_STOP; - } - NSImage* stopStartImage = nsimage_cache::ImageNamed(imageName); - [reloadButton_ setImage:stopStartImage]; - [reloadButton_ setTag:tag]; +- (void)setIsLoading:(BOOL)isLoading force:(BOOL)force { + [reloadButton_ setIsLoading:isLoading force:force]; } - (void)setHasToolbar:(BOOL)toolbar hasLocationBar:(BOOL)locBar { |