Move more from Window onto Widget.

chrome/browser/ui/views/menu_item_view_test.cc

 // Copyright (c) 2011 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 "chrome/browser/automation/ui_controls.h"
 #include "chrome/test/interactive_ui/view_event_test_base.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/menu/menu_controller.h"
 #include "views/controls/menu/menu_item_view.h"
 #include "views/controls/menu/submenu_view.h"
@@ skipping 50 matching lines @@
   virtual gfx::Size GetPreferredSize() OVERRIDE {
     return button_->GetPreferredSize();
   }
 
   // views::ViewMenuDelegate implementation.
   virtual void RunMenu(views::View* source, const gfx::Point& pt) OVERRIDE {
     gfx::Point screen_location;
     views::View::ConvertPointToScreen(source, &screen_location);
     gfx::Rect bounds(screen_location, source->size());
     menu_->RunMenuAt(
-        source->GetWindow()->GetNativeWindow(),
+        source->GetWidget()->GetNativeWindow(),
         button_,
         bounds,
         views::MenuItemView::TOPLEFT,
         true);
   }
 
  protected:
   // Generate a mouse click on the specified view and post a new task.
   virtual void Click(views::View* view, Task* next) {
     ui_controls::MoveMouseToCenterAndPress(
@@ skipping 387 matching lines @@
 
  private:
   int last_command_;
   views::MenuItemView* submenu_;
 };
 
 typedef MenuItemViewTestRemoveWithSubmenu<0> MenuItemViewTestRemoveWithSubmenu0;
 typedef MenuItemViewTestRemoveWithSubmenu<1> MenuItemViewTestRemoveWithSubmenu1;
 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu0, RemoveItemWithSubmenu0)
 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu1, RemoveItemWithSubmenu1)