Makes MenuButton compile and fixes bug in GtkWidget I happened upon.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/115826

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17018 0039d316-1c4b-4281-b951-d872f2087c98

views/controls/button/menu_button.cc

@@ -8,7 +8,6 @@
 #include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "app/win_util.h"
 #include "grit/app_strings.h"
 #include "grit/app_resources.h"
 #include "views/controls/button/button.h"
@@ -17,6 +16,10 @@
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 
+#if defined(OS_WIN)
+#include "app/win_util.h"
+#endif
+
 using base::Time;
 using base::TimeDelta;
 
@@ -109,6 +112,7 @@ int MenuButton::GetMaximumScreenXCoordinate() {
     return 0;
   }
 
+#if defined(OS_WIN)
   HWND hwnd = widget->GetNativeView();
   RECT t;
   ::GetWindowRect(hwnd, &t);
@@ -116,6 +120,10 @@ int MenuButton::GetMaximumScreenXCoordinate() {
   gfx::Rect r(t);
   gfx::Rect monitor_rect = win_util::GetMonitorBoundsForRect(r);
   return monitor_rect.x() + monitor_rect.width() - 1;
+#else
+  NOTIMPLEMENTED();
+  return 1000000;
+#endif
 }
 
 bool MenuButton::Activate() {
@@ -205,9 +213,13 @@ void MenuButton::OnMouseReleased(const MouseEvent& e,
 
 // When the space bar or the enter key is pressed we need to show the menu.
 bool MenuButton::OnKeyReleased(const KeyEvent& e) {
+#if defined(OS_WIN)
   if ((e.GetCharacter() == VK_SPACE) || (e.GetCharacter() == VK_RETURN)) {
     return Activate();
   }
+#else
+  NOTIMPLEMENTED();
+#endif
   return true;
 }
 

views/views.gyp

@@ -232,7 +232,6 @@
             'accessibility/view_accessibility_wrapper.cc',
             'controls/scrollbar/bitmap_scroll_bar.cc',
             'controls/button/button_dropdown.cc',
-            'controls/button/menu_button.cc',
             'controls/button/radio_button.cc',
             'controls/combo_box.cc',
             'controls/hwnd_view.cc',

views/widget/widget_gtk.cc

@@ -13,8 +13,7 @@ namespace views {
 
 // Returns the position of a widget on screen.
 static void GetWidgetPositionOnScreen(GtkWidget* widget, int* x, int *y) {
-  GtkWidget* parent = widget;
-  while (parent) {
+  while (widget) {
     if (GTK_IS_WINDOW(widget)) {
       int window_x, window_y;
       gtk_window_get_position(GTK_WINDOW(widget), &window_x, &window_y);
@@ -25,7 +24,7 @@ static void GetWidgetPositionOnScreen(GtkWidget* widget, int* x, int *y) {
     // Not a window.
     *x += widget->allocation.x;
     *y += widget->allocation.y;
-    parent = gtk_widget_get_parent(parent);
+    widget = gtk_widget_get_parent(widget);
   }
 }