diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-29 00:11:44 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-29 00:11:44 +0000 |
| commit | 0d4b67fb35fdcd99d866b77dc4ab8aa5acb92938 (patch) | |
| tree | 40558a7bc90f457038055a3bfd1551db5eff1400 /chrome/browser | |
| parent | 45b2e16d81eb606ecbd102ca36dc51d87298f966 (diff) | |
| download | chromium_src-0d4b67fb35fdcd99d866b77dc4ab8aa5acb92938.zip chromium_src-0d4b67fb35fdcd99d866b77dc4ab8aa5acb92938.tar.gz chromium_src-0d4b67fb35fdcd99d866b77dc4ab8aa5acb92938.tar.bz2 | |
Gets GoButton to compile on Linux.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/115879
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17146 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/views/go_button.cc | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/chrome/browser/views/go_button.cc b/chrome/browser/views/go_button.cc index b0a817c..54381ae 100644 --- a/chrome/browser/views/go_button.cc +++ b/chrome/browser/views/go_button.cc @@ -5,6 +5,7 @@ #include "chrome/browser/views/go_button.h" #include "app/l10n_util.h" +#include "base/compiler_specific.h" #include "base/message_loop.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/browser.h" @@ -17,12 +18,12 @@ GoButton::GoButton(LocationBarView* location_bar, Browser* browser) : ToggleImageButton(this), + button_delay_(0), + ALLOW_THIS_IN_INITIALIZER_LIST(stop_timer_(this)), location_bar_(location_bar), browser_(browser), intended_mode_(MODE_GO), - visible_mode_(MODE_GO), - button_delay_(NULL), - stop_timer_(this) { + visible_mode_(MODE_GO) { DCHECK(location_bar_); set_triggerable_event_flags(views::Event::EF_LEFT_BUTTON_DOWN | views::Event::EF_MIDDLE_BUTTON_DOWN); @@ -61,8 +62,14 @@ void GoButton::ButtonPressed(views::Button* button) { browser_->Go(event_utils::DispositionFromEventFlags(mouse_event_flags())); // Figure out the system double-click time. - if (button_delay_ == NULL) + if (button_delay_ == 0) { +#if defined(OS_WIN) button_delay_ = GetDoubleClickTime(); +#else + NOTIMPLEMENTED(); + button_delay_ = 500; +#endif + } // Stop any existing timers. stop_timer_.RevokeAll(); |