Move more from Window onto Widget.

chrome/browser/ui/views/bookmarks/bookmark_bar_view.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/bookmarks/bookmark_bar_view.h"
 
 #include <algorithm>
 #include <limits>
 #include <set>
 #include <vector>
@@ skipping 1046 matching lines @@
   } else if (view == overflow_button_) {
     node = model_->GetBookmarkBarNode();
     start_index = GetFirstHiddenNodeIndex();
   } else {
     int button_index = GetIndexOf(view);
     DCHECK_NE(-1, button_index);
     node = model_->GetBookmarkBarNode()->GetChild(button_index);
   }
 
   bookmark_menu_ = new BookmarkMenuController(
-      profile_, page_navigator_, GetWindow()->GetNativeWindow(), node,
+      profile_, page_navigator_, GetWidget()->GetNativeWindow(), node,
       start_index);
   bookmark_menu_->set_observer(this);
   bookmark_menu_->RunMenuAt(this, false);
 }
 
 void BookmarkBarView::ButtonPressed(views::Button* sender,
                                     const views::Event& event) {
   // Show the login wizard if the user clicked the re-login button.
   if (sender->tag() == kSyncErrorButtonTag) {
     DCHECK(sender == sync_error_button_);
@@ skipping 13 matching lines @@
   DCHECK(page_navigator_);
 
   WindowOpenDisposition disposition_from_event_flags =
       event_utils::DispositionFromEventFlags(sender->mouse_event_flags());
 
   if (node->is_url()) {
     RecordAppLaunch(profile_, node->GetURL());
     page_navigator_->OpenURL(node->GetURL(), GURL(),
         disposition_from_event_flags, PageTransition::AUTO_BOOKMARK);
   } else {
-    bookmark_utils::OpenAll(GetWindow()->GetNativeWindow(), profile_,
+    bookmark_utils::OpenAll(GetWidget()->GetNativeWindow(), profile_,
         page_navigator_, node, disposition_from_event_flags);
   }
   UserMetrics::RecordAction(UserMetricsAction("ClickedBookmarkBarURLButton"));
 }
 
 void BookmarkBarView::ShowContextMenuForView(View* source,
                                              const gfx::Point& p,
                                              bool is_mouse_gesture) {
   if (!model_->IsLoaded()) {
     // Don't do anything if the model isn't loaded.
@@ skipping 20 matching lines @@
   } else {
     parent = model_->GetBookmarkBarNode();
     nodes.push_back(parent);
   }
   // Browser may be null during testing.
   PageNavigator* navigator =
       browser() ? browser()->GetSelectedTabContents() : NULL;
   bool close_on_remove =
       (parent == profile_->GetBookmarkModel()->other_node() &&
        parent->child_count() == 1);
-  BookmarkContextMenu controller(GetWindow()->GetNativeWindow(), profile_,
+  BookmarkContextMenu controller(GetWidget()->GetNativeWindow(), profile_,
                                  navigator, parent, nodes, close_on_remove);
   controller.RunMenuAt(p);
 }
 
 void BookmarkBarView::Observe(NotificationType type,
                               const NotificationSource& source,
                               const NotificationDetails& details) {
   DCHECK(profile_);
   switch (type.value) {
     case NotificationType::BOOKMARK_BAR_VISIBILITY_PREF_CHANGED:
@@ skipping 241 matching lines @@
   views::MenuButton* menu_button = GetMenuButtonForNode(node);
   if (!menu_button)
     return;
 
   int start_index = 0;
   if (node == model_->GetBookmarkBarNode())
     start_index = GetFirstHiddenNodeIndex();
 
   drop_info_->is_menu_showing = true;
   bookmark_drop_menu_ = new BookmarkMenuController(
-      profile_, page_navigator_, GetWindow()->GetNativeWindow(), node,
+      profile_, page_navigator_, GetWidget()->GetNativeWindow(), node,
       start_index);
   bookmark_drop_menu_->set_observer(this);
   bookmark_drop_menu_->RunMenuAt(this, true);
 }
 
 void BookmarkBarView::StopShowFolderDropMenuTimer() {
   show_folder_method_factory_.RevokeAll();
 }
 
 void BookmarkBarView::StartShowFolderDropMenuTimer(const BookmarkNode* node) {
@@ skipping 350 matching lines @@
               (1 - size_animation_->GetCurrentValue())));
     } else {
       prefsize.set_height(
           static_cast<int>(
               browser_defaults::kBookmarkBarHeight *
               size_animation_->GetCurrentValue()));
     }
   }
   return prefsize;
 }