diff options
author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-09 06:40:57 +0000 |
---|---|---|
committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-09 06:40:57 +0000 |
commit | 64f001a8a74f5d861d9948155c92419f53928e50 (patch) | |
tree | 4f215495257c68c34f8f1bbc4724e35a73be1788 /chrome/browser/views/go_button.h | |
parent | 253071feeaf010115a8fbe498d1ebd634c2d1626 (diff) | |
download | chromium_src-64f001a8a74f5d861d9948155c92419f53928e50.zip chromium_src-64f001a8a74f5d861d9948155c92419f53928e50.tar.gz chromium_src-64f001a8a74f5d861d9948155c92419f53928e50.tar.bz2 |
Implement stop/go button for Linux.
Refactored code out of CustomDrawButton into CustomDrawButtonBase to be shared with GoButtonGtk.
Replaced the existing non-togglable go button with GoButtonGtk.
Note that tooltip support isn't done yet, as it changes based on the state of the location bar and the go/stop state.
Add a simple test.
Fix some minor lint errors.
BUG=9381
Review URL: http://codereview.chromium.org/62154
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13409 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/go_button.h')
-rw-r--r-- | chrome/browser/views/go_button.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/views/go_button.h b/chrome/browser/views/go_button.h index a830191..cdd5bea 100644 --- a/chrome/browser/views/go_button.h +++ b/chrome/browser/views/go_button.h @@ -5,8 +5,9 @@ #ifndef CHROME_BROWSER_VIEWS_GO_BUTTON_H__ #define CHROME_BROWSER_VIEWS_GO_BUTTON_H__ -#include "chrome/views/controls/button/image_button.h" +#include "base/basictypes.h" #include "base/task.h" +#include "chrome/views/controls/button/image_button.h" class Browser; class LocationBarView; @@ -26,11 +27,11 @@ class LocationBarView; class GoButton : public views::ToggleImageButton, public views::ButtonListener { public: + typedef enum Mode { MODE_GO = 0, MODE_STOP }; + GoButton(LocationBarView* location_bar, Browser* Browser); virtual ~GoButton(); - typedef enum Mode { MODE_GO = 0, MODE_STOP }; - // Force the button state void ChangeMode(Mode mode); @@ -60,7 +61,7 @@ class GoButton : public views::ToggleImageButton, // The currently-visible mode - this may different from the intended mode Mode visible_mode_; - DISALLOW_EVIL_CONSTRUCTORS(GoButton); + DISALLOW_COPY_AND_ASSIGN(GoButton); }; #endif // CHROME_BROWSER_VIEWS_GO_BUTTON_H__ |