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"