TabContentsWrapper -> TabContents, part 48.

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_TABS_TAB_DRAG_CONTROLLER_H_
 #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_DRAG_CONTROLLER_H_
 #pragma once
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/timer.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tabs/dock_info.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
 #include "chrome/browser/ui/tabs/tab_strip_selection_model.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
@@ skipping 135 matching lines @@
 
     // The caller should continue.
     DRAG_BROWSER_RESULT_CONTINUE,
   };
 
   // Stores the date associated with a single tab that is being dragged.
   struct TabDragData {
     TabDragData();
     ~TabDragData();
 
-    // The TabContentsWrapper being dragged.
-    TabContentsWrapper* contents;
+    // The TabContents being dragged.
+    TabContents* contents;
 
     // The original content::WebContentsDelegate of |contents|, before it was
     // detached from the browser window. We store this so that we can forward
     // certain delegate notifications back to it if we can't handle them
     // locally.
     content::WebContentsDelegate* original_delegate;
 
     // This is the index of the tab in |source_tabstrip_| when the drag
     // began. This is used to restore the previous state if the drag is aborted.
     int source_model_index;
 
     // If attached this is the tab in |attached_tabstrip_|.
     BaseTab* attached_tab;
 
     // Is the tab pinned?
     bool pinned;
   };
 
   typedef std::vector<TabDragData> DragData;
 
   // Sets |drag_data| from |tab|. This also registers for necessary
-  // notifications and resets the delegate of the TabContentsWrapper.
+  // notifications and resets the delegate of the TabContents.
   void InitTabDragData(BaseTab* tab, TabDragData* drag_data);
 
   // Overridden from content::WebContentsDelegate:
   virtual content::WebContents* OpenURLFromTab(
       content::WebContents* source,
       const content::OpenURLParams& params) OVERRIDE;
   virtual void NavigationStateChanged(const content::WebContents* source,
                                       unsigned changed_flags) OVERRIDE;
   virtual void AddNewContents(content::WebContents* source,
                               content::WebContents* new_contents,
@@ skipping 191 matching lines @@
 
   void BringWindowUnderPointToFront(const gfx::Point& screen_point);
 
   // Convenience for getting the TabDragData corresponding to the tab the user
   // started dragging.
   TabDragData* source_tab_drag_data() {
     return &(drag_data_[source_tab_index_]);
   }
 
   // Convenience for |source_tab_drag_data()->contents|.
-  TabContentsWrapper* source_dragged_contents() {
+  TabContents* source_dragged_contents() {
     return source_tab_drag_data()->contents;
   }
 
   // Returns the Widget of the currently attached TabStrip's BrowserView.
   views::Widget* GetAttachedBrowserWidget();
 
   // Returns true if the tabs were originality one after the other in
   // |source_tabstrip_|.
   bool AreTabsConsecutive();
 
@@ skipping 139 matching lines @@
   // Non-null for the duration of RunMoveLoop.
   views::Widget* move_loop_widget_;
 
   // If non-null set to true from destructor.
   bool* destroyed_;
 
   DISALLOW_COPY_AND_ASSIGN(TabDragController);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_TABS_TAB_DRAG_CONTROLLER_H_