diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-04 17:46:09 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-04 17:46:09 +0000 |
| commit | 38e27d847b1b043a55b3e3693ced4ba0282944ab (patch) | |
| tree | 67a8a13a3e9f2a1f9d1da35def7c622f3b790082 /views | |
| parent | 01241534f6030445c4e79905f83924b6ff9297e9 (diff) | |
| download | chromium_src-38e27d847b1b043a55b3e3693ced4ba0282944ab.zip chromium_src-38e27d847b1b043a55b3e3693ced4ba0282944ab.tar.gz chromium_src-38e27d847b1b043a55b3e3693ced4ba0282944ab.tar.bz2 | |
views: Remove aura include hack now that crbug.com/94995 is fixed.
R=sky@chromium.org
Review URL: http://codereview.chromium.org/8120021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103933 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/button/button_dropdown.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/views/controls/button/button_dropdown.cc b/views/controls/button/button_dropdown.cc index 2ed6eed..f5477a5 100644 --- a/views/controls/button/button_dropdown.cc +++ b/views/controls/button/button_dropdown.cc @@ -17,19 +17,14 @@ #include "views/controls/menu/menu_runner.h" #include "views/widget/widget.h" -#if defined(USE_AURA) -// TODO(tfarina): Remove this include when crbug.com/94995 is fixed! -#include "ui/aura/window.h" -#endif - namespace views { // static const char ButtonDropDown::kViewClassName[] = "views/controls/button/ButtonDropDown"; -// How long to wait before showing the menu -static const int kMenuTimerDelay = 500; +// How long to wait before showing the menu. +const int kMenuTimerDelay = 500; //////////////////////////////////////////////////////////////////////////////// // @@ -37,8 +32,7 @@ static const int kMenuTimerDelay = 500; // //////////////////////////////////////////////////////////////////////////////// -ButtonDropDown::ButtonDropDown(ButtonListener* listener, - ui::MenuModel* model) +ButtonDropDown::ButtonDropDown(ButtonListener* listener, ui::MenuModel* model) : ImageButton(listener), model_(model), y_position_on_lbuttondown_(0), |