diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-13 17:52:48 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-13 17:52:48 +0000 |
| commit | 00ffe5dd99527a0cb1035af6749417f5fb1c134e (patch) | |
| tree | 4354d5b35be202204d9392417862b423ba374ce0 /views/controls/button | |
| parent | 65f73a3a996bdbaa167e38704df092aa39b53d3a (diff) | |
| download | chromium_src-00ffe5dd99527a0cb1035af6749417f5fb1c134e.zip chromium_src-00ffe5dd99527a0cb1035af6749417f5fb1c134e.tar.gz chromium_src-00ffe5dd99527a0cb1035af6749417f5fb1c134e.tar.bz2 | |
Revert 15965. I wasn't supposed to check that in since it still doesn't compile on linux and mac!
TBR=sky
Review URL: http://codereview.chromium.org/113351
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15967 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/button')
| -rw-r--r-- | views/controls/button/button_dropdown.cc | 3 | ||||
| -rw-r--r-- | views/controls/button/menu_button.cc | 5 | ||||
| -rw-r--r-- | views/controls/button/native_button_win.cc | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/views/controls/button/button_dropdown.cc b/views/controls/button/button_dropdown.cc index 157caf0..270894b 100644 --- a/views/controls/button/button_dropdown.cc +++ b/views/controls/button/button_dropdown.cc @@ -5,7 +5,6 @@ #include "views/controls/button/button_dropdown.h" #include "app/l10n_util.h" -#include "base/compiler_specific.h" #include "base/message_loop.h" #include "grit/generated_resources.h" #include "views/controls/menu/view_menu_delegate.h" @@ -27,7 +26,7 @@ ButtonDropDown::ButtonDropDown(ButtonListener* listener, : ImageButton(listener), menu_delegate_(menu_delegate), y_position_on_lbuttondown_(0), - ALLOW_THIS_IN_INITIALIZER_LIST(show_menu_factory_(this)) { + show_menu_factory_(this) { } ButtonDropDown::~ButtonDropDown() { diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc index 6dbf4ae..993cd9b 100644 --- a/views/controls/button/menu_button.cc +++ b/views/controls/button/menu_button.cc @@ -110,7 +110,7 @@ int MenuButton::GetMaximumScreenXCoordinate() { } HWND hwnd = widget->GetNativeView(); - RECT t; + CRect t; ::GetWindowRect(hwnd, &t); gfx::Rect r(t); @@ -154,7 +154,8 @@ bool MenuButton::Activate() { GetRootView()->SetMouseHandler(NULL); menu_visible_ = true; - menu_delegate_->RunMenu(this, menu_position, GetWidget()->GetNativeView()); + menu_delegate_->RunMenu(this, menu_position.ToPOINT(), + GetWidget()->GetNativeView()); menu_visible_ = false; menu_closed_time_ = Time::Now(); diff --git a/views/controls/button/native_button_win.cc b/views/controls/button/native_button_win.cc index 5dd70d3..6748241 100644 --- a/views/controls/button/native_button_win.cc +++ b/views/controls/button/native_button_win.cc @@ -4,8 +4,6 @@ #include "views/controls/button/native_button_win.h" -#include <commctrl.h> - #include "base/logging.h" #include "views/controls/button/checkbox.h" #include "views/controls/button/native_button.h" |