TabContentsWrapper -> TabContents, part 13.

chrome/browser/ui/tabs/tab_strip_model_order_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/tabs/tab_strip_model_order_controller.h"
 
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "content/public/browser/web_contents.h"
 
 using content::NavigationController;
 
 ///////////////////////////////////////////////////////////////////////////////
 // TabStripModelOrderController, public:
 
 TabStripModelOrderController::TabStripModelOrderController(
     TabStripModel* tabstrip)
     : tabstrip_(tabstrip),
       insertion_policy_(TabStripModel::INSERT_AFTER) {
   tabstrip_->AddObserver(this);
 }
 
 TabStripModelOrderController::~TabStripModelOrderController() {
   tabstrip_->RemoveObserver(this);
 }
 
 int TabStripModelOrderController::DetermineInsertionIndex(
-    TabContentsWrapper* new_contents,
+    TabContents* new_contents,
     content::PageTransition transition,
     bool foreground) {
   int tab_count = tabstrip_->count();
   if (!tab_count)
     return 0;
 
   // NOTE: TabStripModel enforces that all non-mini-tabs occur after mini-tabs,
   // so we don't have to check here too.
   if (transition == content::PAGE_TRANSITION_LINK &&
       tabstrip_->active_index() != -1) {
@@ skipping 67 matching lines @@
 
   // No opener set, fall through to the default handler...
   int selected_index = tabstrip_->active_index();
   if (selected_index >= (tab_count - 1))
     return selected_index - 1;
 
   return selected_index;
 }
 
 void TabStripModelOrderController::ActiveTabChanged(
-    TabContentsWrapper* old_contents,
-    TabContentsWrapper* new_contents,
+    TabContents* old_contents,
+    TabContents* new_contents,
     int index,
     bool user_gesture) {
   NavigationController* old_opener = NULL;
   if (old_contents) {
     int index = tabstrip_->GetIndexOfTabContents(old_contents);
     if (index != TabStripModel::kNoTab) {
       old_opener = tabstrip_->GetOpenerOfTabContentsAt(index);
 
       // Forget any group/opener relationships that need to be reset whenever
       // selection changes (see comment in TabStripModel::AddTabContentsAt).
@@ skipping 14 matching lines @@
 
 ///////////////////////////////////////////////////////////////////////////////
 // TabStripModelOrderController, private:
 
 int TabStripModelOrderController::GetValidIndex(
     int index, int removing_index) const {
   if (removing_index < index)
     index = std::max(0, index - 1);
   return index;
 }