diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-15 18:08:49 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-15 18:08:49 +0000 |
| commit | c398981aa94189d9173b304e5b1d67f97e79fbc8 (patch) | |
| tree | a76be0ddc0038b3e9c2d28736e351fc0117e1320 /chrome/browser/gtk | |
| parent | 8aa31e5bb274abd6f5eb43e6297e00cf6d365856 (diff) | |
| download | chromium_src-c398981aa94189d9173b304e5b1d67f97e79fbc8.zip chromium_src-c398981aa94189d9173b304e5b1d67f97e79fbc8.tar.gz chromium_src-c398981aa94189d9173b304e5b1d67f97e79fbc8.tar.bz2 | |
Fix regression I introduced where Stop/Go button would toggle state instantly instead of having protections against accidental user actions while the mouse was hovering the button.
I elected to condense ChangeMode() and ScheduleChangeMode() into one function, which as a result became pretty simple.
BUG=9843
Review URL: http://codereview.chromium.org/67156
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13761 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk')
| -rw-r--r-- | chrome/browser/gtk/browser_window_gtk.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/gtk/browser_window_gtk.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc index a700d9d..78c87b0 100644 --- a/chrome/browser/gtk/browser_window_gtk.cc +++ b/chrome/browser/gtk/browser_window_gtk.cc @@ -434,9 +434,9 @@ void BrowserWindowGtk::SetFocusToLocationBar() { GetLocationBar()->FocusLocation(); } -void BrowserWindowGtk::UpdateStopGoState(bool is_loading) { +void BrowserWindowGtk::UpdateStopGoState(bool is_loading, bool force) { toolbar_->GetGoButton()->ChangeMode( - is_loading ? GoButtonGtk::MODE_STOP : GoButtonGtk::MODE_GO); + is_loading ? GoButtonGtk::MODE_STOP : GoButtonGtk::MODE_GO, force); } void BrowserWindowGtk::UpdateToolbar(TabContents* contents, diff --git a/chrome/browser/gtk/browser_window_gtk.h b/chrome/browser/gtk/browser_window_gtk.h index e7d87cf..a304328 100644 --- a/chrome/browser/gtk/browser_window_gtk.h +++ b/chrome/browser/gtk/browser_window_gtk.h @@ -59,7 +59,7 @@ class BrowserWindowGtk : public BrowserWindow, virtual bool IsFullscreen() const; virtual LocationBar* GetLocationBar() const; virtual void SetFocusToLocationBar(); - virtual void UpdateStopGoState(bool is_loading); + virtual void UpdateStopGoState(bool is_loading, bool force); virtual void UpdateToolbar(TabContents* contents, bool should_restore_state); virtual void FocusToolbar(); |