TabContentsWrapper -> TabContents, part 13.

chrome/browser/ui/tabs/tab_strip_model_observer.h

Index: chrome/browser/ui/tabs/tab_strip_model_observer.h
diff --git a/chrome/browser/ui/tabs/tab_strip_model_observer.h b/chrome/browser/ui/tabs/tab_strip_model_observer.h
index f61367902ee76c491367fa37cb67153fb4c67a0b..1a0527f888121a342f241bb4ade4982f132c680c 100644
--- a/chrome/browser/ui/tabs/tab_strip_model_observer.h
+++ b/chrome/browser/ui/tabs/tab_strip_model_observer.h
@@ -7,7 +7,6 @@
 #pragma once
 
 class TabContents;
-typedef TabContents TabContentsWrapper;
 class TabStripModel;
 class TabStripSelectionModel;
 
@@ -40,29 +39,29 @@ class TabStripModelObserver {
     ALL
   };
 
-  // A new TabContentsWrapper was inserted into the TabStripModel at the
+  // A new TabContents was inserted into the TabStripModel at the
   // specified index. |foreground| is whether or not it was opened in the
   // foreground (selected).
-  virtual void TabInsertedAt(TabContentsWrapper* contents,
+  virtual void TabInsertedAt(TabContents* contents,
                              int index,
                              bool foreground);
 
-  // The specified TabContentsWrapper at |index| is being closed (and eventually
+  // The specified TabContents at |index| is being closed (and eventually
   // destroyed). |tab_strip_model| is the TabStripModel the tab was part of.
   virtual void TabClosingAt(TabStripModel* tab_strip_model,
-                            TabContentsWrapper* contents,
+                            TabContents* contents,
                             int index);
 
-  // The specified TabContentsWrapper at |index| is being detached, perhaps to
+  // The specified TabContents at |index| is being detached, perhaps to
   // be inserted in another TabStripModel. The implementer should take whatever
-  // action is necessary to deal with the TabContentsWrapper no longer being
+  // action is necessary to deal with the TabContents no longer being
   // present.
-  virtual void TabDetachedAt(TabContentsWrapper* contents, int index);
+  virtual void TabDetachedAt(TabContents* contents, int index);
 
-  // The active TabContentsWrapper is about to change from |old_contents|.
+  // The active TabContents is about to change from |old_contents|.
   // This gives observers a chance to prepare for an impending switch before it
   // happens.
-  virtual void TabDeactivated(TabContentsWrapper* contents);
+  virtual void TabDeactivated(TabContents* contents);
 
   // Sent when the active tab changes. The previously active tab is identified
   // by |old_contents| and the newly active tab by |new_contents|. |index| is
@@ -74,8 +73,8 @@ class TabStripModelObserver {
   // but does change the selection. In this case |ActiveTabChanged| is not sent.
   // If you care about any changes to the selection, override
   // TabSelectionChanged.
-  virtual void ActiveTabChanged(TabContentsWrapper* old_contents,
-                                TabContentsWrapper* new_contents,
+  virtual void ActiveTabChanged(TabContents* old_contents,
+                                TabContents* new_contents,
                                 int index,
                                 bool user_gesture);
 
@@ -86,42 +85,42 @@ class TabStripModelObserver {
   virtual void TabSelectionChanged(TabStripModel* tab_strip_model,
                                    const TabStripSelectionModel& old_model);
 
-  // The specified TabContentsWrapper at |from_index| was moved to |to_index|.
-  virtual void TabMoved(TabContentsWrapper* contents,
+  // The specified TabContents at |from_index| was moved to |to_index|.
+  virtual void TabMoved(TabContents* contents,
                         int from_index,
                         int to_index);
 
-  // The specified TabContentsWrapper at |index| changed in some way. |contents|
+  // The specified TabContents at |index| changed in some way. |contents|
   // may be an entirely different object and the old value is no longer
   // available by the time this message is delivered.
   //
   // See TabChangeType for a description of |change_type|.
-  virtual void TabChangedAt(TabContentsWrapper* contents,
+  virtual void TabChangedAt(TabContents* contents,
                             int index,
                             TabChangeType change_type);
 
   // The tab contents was replaced at the specified index. This is invoked
   // when instant is enabled and the user navigates by way of instant or when
-  // prerendering swaps in a prerendered TabContentsWrapper.
+  // prerendering swaps in a prerendered TabContents.
   virtual void TabReplacedAt(TabStripModel* tab_strip_model,
-                             TabContentsWrapper* old_contents,
-                             TabContentsWrapper* new_contents,
+                             TabContents* old_contents,
+                             TabContents* new_contents,
                              int index);
 
   // Invoked when the pinned state of a tab changes. See note in
   // TabMiniStateChanged as to how this relates to TabMiniStateChanged.
-  virtual void TabPinnedStateChanged(TabContentsWrapper* contents, int index);
+  virtual void TabPinnedStateChanged(TabContents* contents, int index);
 
   // Invoked if the mini state of a tab changes.
   // NOTE: this is sent when the pinned state of a non-app tab changes and is
   // sent in addition to TabPinnedStateChanged. UI code typically need not care
   // about TabPinnedStateChanged, but instead this.
-  virtual void TabMiniStateChanged(TabContentsWrapper* contents, int index);
+  virtual void TabMiniStateChanged(TabContents* contents, int index);
 
   // Invoked when the blocked state of a tab changes.
   // NOTE: This is invoked when a tab becomes blocked/unblocked by a tab modal
   // window.
-  virtual void TabBlockedStateChanged(TabContentsWrapper* contents, int index);
+  virtual void TabBlockedStateChanged(TabContents* contents, int index);
 
   // The TabStripModel now no longer has any tabs. The implementer may
   // use this as a trigger to try and close the window containing the