Move more from Window onto Widget.

chrome/browser/ui/views/tabs/base_tab_strip.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/tabs/base_tab_strip.h"
 
 #include "base/logging.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/tabs/dragged_tab_controller.h"
 #include "chrome/browser/ui/views/tabs/tab_strip_controller.h"
@@ skipping 118 matching lines @@
   BaseTab* tab = CreateTab();
   tab->SetData(data);
 
   TabData d = { tab, gfx::Rect() };
   tab_data_.insert(tab_data_.begin() + ModelIndexToTabIndex(model_index), d);
 
   AddChildView(tab);
 
   // Don't animate the first tab, it looks weird, and don't animate anything
   // if the containing window isn't visible yet.
-  if (tab_count() > 1 && GetWindow() && GetWindow()->IsVisible())
+  if (tab_count() > 1 && GetWidget() && GetWidget()->IsVisible())
     StartInsertTabAnimation(model_index);
   else
     DoLayout();
 }
 
 void BaseTabStrip::MoveTab(int from_model_index, int to_model_index) {
   int from_tab_data_index = ModelIndexToTabIndex(from_model_index);
   BaseTab* tab = tab_data_[from_tab_data_index].tab;
   tab_data_.erase(tab_data_.begin() + from_tab_data_index);
 
   TabData data = {tab, gfx::Rect()};
   int to_tab_data_index = ModelIndexToTabIndex(to_model_index);
   tab_data_.insert(tab_data_.begin() + to_tab_data_index, data);
 
   StartMoveTabAnimation();
 }
 
 void BaseTabStrip::SetTabData(int model_index, const TabRendererData& data) {
   BaseTab* tab = GetBaseTabAtModelIndex(model_index);
   bool mini_state_changed = tab->data().mini != data.mini;
   tab->SetData(data);
 
   if (mini_state_changed) {
-    if (GetWindow() && GetWindow()->IsVisible())
+    if (GetWidget() && GetWidget()->IsVisible())
       StartMiniTabAnimation();
     else
       DoLayout();
   }
 }
 
 BaseTab* BaseTabStrip::GetBaseTabAtModelIndex(int model_index) const {
   return base_tab_at_tab_index(ModelIndexToTabIndex(model_index));
 }
 
@@ skipping 405 matching lines @@
     // Animate the view back to its correct position.
     GenerateIdealBounds();
     AnimateToIdealBounds();
   }
   bounds_animator_.AnimateViewTo(tab, ideal_bounds(TabIndexOfTab(tab)));
   // Install a delegate to reset the dragging state when done. We have to leave
   // dragging true for the tab otherwise it'll draw beneath the new tab button.
   bounds_animator_.SetAnimationDelegate(
       tab, new ResetDraggingStateDelegate(tab), true);
 }