Move more from Window onto Widget.

chrome/browser/ui/views/wrench_menu.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/ui/views/wrench_menu.h"
 
 #include <cmath>
 
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 584 matching lines @@
 void WrenchMenu::RunMenu(views::MenuButton* host) {
   // Up the ref count while the menu is displaying. This way if the window is
   // deleted while we're running we won't prematurely delete the menu.
   // TODO(sky): fix this, the menu should really take ownership of the menu
   // (57890).
   scoped_refptr<WrenchMenu> dont_delete_while_running(this);
   gfx::Point screen_loc;
   views::View::ConvertPointToScreen(host, &screen_loc);
   gfx::Rect bounds(screen_loc, host->size());
   UserMetrics::RecordAction(UserMetricsAction("ShowAppMenu"));
-  root_->RunMenuAt(host->GetWindow()->GetNativeWindow(), host, bounds,
+  root_->RunMenuAt(host->GetWidget()->GetNativeWindow(), host, bounds,
       MenuItemView::TOPRIGHT, true);
   if (bookmark_menu_delegate_.get()) {
     BookmarkModel* model = browser_->profile()->GetBookmarkModel();
     if (model)
       model->RemoveObserver(this);
   }
   if (selected_menu_model_)
     selected_menu_model_->ActivatedAt(selected_index_);
 }
 
@@ skipping 249 matching lines @@
   model->AddObserver(this);
   bookmark_menu_delegate_.reset(
       new BookmarkMenuDelegate(browser_->profile(),
                                NULL,
                                browser_->window()->GetNativeHandle(),
                                first_bookmark_command_id_));
   bookmark_menu_delegate_->Init(
       this, bookmark_menu_, model->GetBookmarkBarNode(), 0,
       BookmarkMenuDelegate::SHOW_OTHER_FOLDER);
 }