Converts some uses of native_view to native_window. This is necessitated...

views/controls/button/menu_button.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/controls/button/menu_button.h"
 
 #include "app/drag_drop_types.h"
 #include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "grit/app_strings.h"
 #include "grit/app_resources.h"
 #include "views/controls/button/button.h"
 #include "views/controls/menu/view_menu_delegate.h"
 #include "views/event.h"
+#include "views/screen.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
-
-#if defined(OS_WIN)
-#include "app/win_util.h"
-#endif
+#include "views/window/window.h"
 
 using base::Time;
 using base::TimeDelta;
 
 namespace views {
 
 // The amount of time, in milliseconds, we wait before allowing another mouse
 // pressed event to show the menu.
 static const int64 kMinimumTimeBetweenButtonClicks = 100;
 
@@ skipping 66 matching lines @@
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // MenuButton - Events
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 int MenuButton::GetMaximumScreenXCoordinate() {
-  Widget* widget = GetWidget();
-
-  if (!widget) {
+  if (!GetWindow()) {
     NOTREACHED();
     return 0;
   }
 
-#if defined(OS_WIN)
-  HWND hwnd = widget->GetNativeView();
-  RECT t;
-  ::GetWindowRect(hwnd, &t);
-
-  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
+  gfx::Rect monitor_bounds =
+      Screen::GetMonitorWorkAreaNearestWindow(GetWindow()->GetNativeWindow());
+  return monitor_bounds.right() - 1;
 }
 
 bool MenuButton::Activate() {
   SetState(BS_PUSHED);
   // We need to synchronously paint here because subsequently we enter a
   // menu modal loop which will stop this window from updating and
   // receiving the paint message that should be spawned by SetState until
   // after the menu closes.
   PaintNow();
   if (menu_delegate_) {
@@ skipping 18 matching lines @@
     // We're about to show the menu from a mouse press. By showing from the
     // mouse press event we block RootView in mouse dispatching. This also
     // appears to cause RootView to get a mouse pressed BEFORE the mouse
     // release is seen, which means RootView sends us another mouse press no
     // matter where the user pressed. To force RootView to recalculate the
     // mouse target during the mouse press we explicitly set the mouse handler
     // to NULL.
     GetRootView()->SetMouseHandler(NULL);
 
     menu_visible_ = true;
-    menu_delegate_->RunMenu(this, menu_position, GetWidget()->GetNativeView());
+    menu_delegate_->RunMenu(this, menu_position);
     menu_visible_ = false;
     menu_closed_time_ = Time::Now();
 
     // Now that the menu has closed, we need to manually reset state to
     // "normal" since the menu modal loop will have prevented normal
     // mouse move messages from getting to this View. We set "normal"
     // and not "hot" because the likelihood is that the mouse is now
     // somewhere else (user clicked elsewhere on screen to close the menu
     // or selected an item) and we will inevitably refresh the hot state
     // in the event the mouse _is_ over the view.
@@ skipping 80 matching lines @@
 }
 
 bool MenuButton::GetAccessibleState(AccessibilityTypes::State* state) {
   DCHECK(state);
 
   *state = AccessibilityTypes::STATE_HASPOPUP;
   return true;
 }
 
 }  // namespace views