Move more from Window onto Widget.

chrome/browser/ui/views/tabs/dragged_tab_controller.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/dragged_tab_controller.h"
 
 #include <math.h>
 #include <set>
 
 #include "base/callback.h"
@@ skipping 908 matching lines @@
     tabs_to_source.erase(tabs_to_source.begin() + source_tab_index_ + 1,
                          tabs_to_source.end());
     int new_x = attached_tabstrip_->GetSizeNeededForTabs(tabs_to_source) -
         tabs[source_tab_index_]->width() +
         static_cast<int>(offset_to_width_ratio_ *
                          tabs[source_tab_index_]->width());
     mouse_offset_.set_x(new_x);
   }
 
   // Move the corresponding window to the front.
-  attached_tabstrip_->GetWindow()->Activate();
+  attached_tabstrip_->GetWidget()->Activate();
 }
 
 void DraggedTabController::Detach() {
   // Prevent the TabContents' HWND from being hidden by any of the model
   // operations performed during the drag.
   source_dragged_contents()->tab_contents()->set_capturing_contents(true);
 
   // Calculate the drag bounds.
   std::vector<gfx::Rect> drag_bounds;
   std::vector<BaseTab*> attached_tabs;
@@ skipping 328 matching lines @@
           UserMetrics::RecordAction(
               UserMetricsAction("DockingWindow_BottomHalf"));
           break;
 
         default:
           NOTREACHED();
           break;
       }
     }
     // Compel the model to construct a new window for the detached TabContents.
-    views::Window* window = source_tabstrip_->GetWindow();
-    gfx::Rect window_bounds(window->GetNormalBounds());
+    views::Widget* widget = source_tabstrip_->GetWidget();
+    gfx::Rect window_bounds(widget->GetRestoredBounds());
     window_bounds.set_origin(GetWindowCreatePoint());
     // When modifying the following if statement, please make sure not to
     // introduce issue listed in http://crbug.com/6223 comment #11.
     bool rtl_ui = base::i18n::IsRTL();
     bool has_dock_position = (dock_info_.type() != DockInfo::NONE);
     if (rtl_ui && has_dock_position) {
       // Mirror X axis so the docked tab is aligned using the mouse click as
       // the top-right corner.
       window_bounds.set_x(window_bounds.x() - window_bounds.width());
     }
     Browser* new_browser =
         GetModel(source_tabstrip_)->delegate()->CreateNewStripWithContents(
             drag_data_[0].contents, window_bounds, dock_info_,
-            window->IsMaximized());
+            widget->IsMaximized());
     TabStripModel* new_model = new_browser->tabstrip_model();
     new_model->SetTabPinned(
         new_model->GetIndexOfTabContents(drag_data_[0].contents),
         drag_data_[0].pinned);
     for (size_t i = 1; i < drag_data_.size(); ++i) {
       new_model->InsertTabContentsAt(
           static_cast<int>(i),
           drag_data_[i].contents,
           drag_data_[i].pinned ? TabStripModel::ADD_PINNED :
                                  TabStripModel::ADD_NONE);
@@ skipping 137 matching lines @@
 
 bool DraggedTabController::AreTabsConsecutive() {
   for (size_t i = 1; i < drag_data_.size(); ++i) {
     if (drag_data_[i - 1].source_model_index + 1 !=
         drag_data_[i].source_model_index) {
       return false;
     }
   }
   return true;
 }