TabContentsWrapper -> TabContents, part 48.

chrome/browser/ui/views/tabs/tab_drag_controller.cc

 // Copyright (c) 2012 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/tab_drag_controller.h"
 
 #include <math.h>
 #include <set>
 
 #include "base/callback.h"
@@ skipping 448 matching lines @@
 }
 
 void TabDragController::InitTabDragData(BaseTab* tab,
                                         TabDragData* drag_data) {
   drag_data->source_model_index =
       source_tabstrip_->GetModelIndexOfBaseTab(tab);
   drag_data->contents = GetModel(source_tabstrip_)->GetTabContentsAt(
       drag_data->source_model_index);
   drag_data->pinned = source_tabstrip_->IsTabPinned(tab);
   registrar_.Add(this, chrome::NOTIFICATION_TAB_CONTENTS_DESTROYED,
-                 content::Source<TabContentsWrapper>(drag_data->contents));
+                 content::Source<TabContents>(drag_data->contents));
 
   if (!detach_into_browser_) {
     drag_data->original_delegate =
         drag_data->contents->web_contents()->GetDelegate();
     drag_data->contents->web_contents()->SetDelegate(this);
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // TabDragController, PageNavigator implementation:
@@ skipping 68 matching lines @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // TabDragController, content::NotificationObserver implementation:
 
 void TabDragController::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_TAB_CONTENTS_DESTROYED, type);
-  TabContentsWrapper* destroyed_tab_contents =
-      content::Source<TabContentsWrapper>(source).ptr();
+  TabContents* destroyed_tab_contents =
+      content::Source<TabContents>(source).ptr();
   WebContents* destroyed_web_contents = destroyed_tab_contents->web_contents();
   for (size_t i = 0; i < drag_data_.size(); ++i) {
     if (drag_data_[i].contents == destroyed_tab_contents) {
       // One of the tabs we're dragging has been destroyed. Cancel the drag.
       if (destroyed_web_contents->GetDelegate() == this)
         destroyed_web_contents->SetDelegate(NULL);
       drag_data_[i].contents = NULL;
       drag_data_[i].original_delegate = NULL;
       EndDragImpl(TAB_DESTROYED);
       return;
@@ skipping 294 matching lines @@
 
   bool did_layout = false;
   // Update the model, moving the WebContents from one index to another. Do this
   // only if we have moved a minimum distance since the last reorder (to prevent
   // jitter) or if this the first move and the tabs are not consecutive.
   if ((abs(screen_point.x() - last_move_screen_loc_) > threshold ||
         (initial_move_ && !AreTabsConsecutive()))) {
     TabStripModel* attached_model = GetModel(attached_tabstrip_);
     gfx::Rect bounds = GetDraggedViewTabStripBounds(dragged_view_point);
     int to_index = GetInsertionIndexForDraggedBounds(bounds);
-    TabContentsWrapper* last_contents =
-        drag_data_[drag_data_.size() - 1].contents;
+    TabContents* last_contents = drag_data_[drag_data_.size() - 1].contents;
     int index_of_last_item =
           attached_model->GetIndexOfTabContents(last_contents);
     if (initial_move_) {
       // TabStrip determines if the tabs needs to be animated based on model
       // position. This means we need to invoke LayoutDraggedTabsAt before
       // changing the model.
       attached_tabstrip_->LayoutDraggedTabsAt(
           tabs, source_tab_drag_data()->attached_tab, dragged_view_point,
           initial_move_);
       did_layout = true;
@@ skipping 991 matching lines @@
     }
 
     default:
       break; // Nothing to do for DETACH_ABOVE_OR_BELOW.
   }
 
   SetTrackedByWorkspace(browser->window()->GetNativeWindow(), false);
   browser->window()->SetBounds(new_bounds);
   return browser;
 }