Move more from Window onto Widget.

views/controls/button/button_dropdown.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 "views/controls/button/button_dropdown.h"
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "grit/app_strings.h"
@@ skipping 140 matching lines @@
 
   // Make the button look depressed while the menu is open.
   SetState(BS_PUSHED);
 
   // Create and run menu.  Display an empty menu if model is NULL.
   if (model_) {
     MenuModelAdapter menu_delegate(model_);
     MenuItemView menu(&menu_delegate);
     menu_delegate.BuildMenu(&menu);
 
-    menu.RunMenuAt(GetWindow()->GetNativeWindow(), NULL,
+    menu.RunMenuAt(GetWidget()->GetNativeWindow(), NULL,
                    gfx::Rect(menu_position, gfx::Size(0, 0)),
                    views::MenuItemView::TOPLEFT,
                    true);
   } else {
     MenuDelegate menu_delegate;
     MenuItemView menu(&menu_delegate);
-    menu.RunMenuAt(GetWindow()->GetNativeWindow(), NULL,
+    menu.RunMenuAt(GetWidget()->GetNativeWindow(), NULL,
                    gfx::Rect(menu_position, gfx::Size(0, 0)),
                    views::MenuItemView::TOPLEFT,
                    true);
   }
 
   // Need to explicitly clear mouse handler so that events get sent
   // properly after the menu finishes running. If we don't do this, then
   // the first click to other parts of the UI is eaten.
   SetMouseHandler(NULL);
 
   // Set the state back to normal after the drop down menu is closed.
   if (state_ != BS_DISABLED)
     SetState(BS_NORMAL);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // ButtonDropDown - Accessibility
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 }  // namespace views