TabContentsWrapper -> TabContents, part 48.

chrome/browser/ui/views/tabs/browser_tab_strip_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/browser_tab_strip_controller.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.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/tab_menu_model.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/tabs/tab_strip_selection_model.h"
 #include "chrome/browser/ui/views/tabs/tab.h"
 #include "chrome/browser/ui/views/tabs/tab_renderer_data.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
@@ skipping 266 matching lines @@
   context_menu_contents_->RunMenuAt(p);
 }
 
 void BrowserTabStripController::UpdateLoadingAnimations() {
   // Don't use the model count here as it's possible for this to be invoked
   // before we've applied an update from the model (Browser::TabInsertedAt may
   // be processed before us and invokes this).
   for (int i = 0, tab_count = tabstrip_->tab_count(); i < tab_count; ++i) {
     BaseTab* tab = tabstrip_->tab_at(i);
     if (model_->ContainsIndex(i)) {
-      TabContentsWrapper* contents = model_->GetTabContentsAt(i);
+      TabContents* contents = model_->GetTabContentsAt(i);
       tab->UpdateLoadingAnimation(
           TabContentsNetworkState(contents->web_contents()));
     }
   }
 }
 
 int BrowserTabStripController::HasAvailableDragActions() const {
   return model_->delegate()->GetDragActions();
 }
 
@@ skipping 55 matching lines @@
     return;
 
   g_browser_process->local_state()->SetInteger(
       prefs::kTabStripLayoutType,
       static_cast<int>(tabstrip_->layout_type()));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserTabStripController, TabStripModelObserver implementation:
 
-void BrowserTabStripController::TabInsertedAt(TabContentsWrapper* contents,
+void BrowserTabStripController::TabInsertedAt(TabContents* contents,
                                               int model_index,
                                               bool is_active) {
   DCHECK(contents);
   DCHECK(model_->ContainsIndex(model_index));
   AddTab(contents, model_index, is_active);
 }
 
-void BrowserTabStripController::TabDetachedAt(TabContentsWrapper* contents,
+void BrowserTabStripController::TabDetachedAt(TabContents* contents,
                                               int model_index) {
   // Cancel any pending tab transition.
   hover_tab_selector_.CancelTabTransition();
 
   tabstrip_->RemoveTabAt(model_index);
 }
 
 void BrowserTabStripController::TabSelectionChanged(
     TabStripModel* tab_strip_model,
     const TabStripSelectionModel& old_model) {
   tabstrip_->SetSelection(old_model, model_->selection_model());
 }
 
-void BrowserTabStripController::TabMoved(TabContentsWrapper* contents,
+void BrowserTabStripController::TabMoved(TabContents* contents,
                                          int from_model_index,
                                          int to_model_index) {
   // Cancel any pending tab transition.
   hover_tab_selector_.CancelTabTransition();
 
   // Pass in the TabRendererData as the pinned state may have changed.
   TabRendererData data;
   SetTabRendererDataFromModel(contents->web_contents(), to_model_index, &data,
                               EXISTING_TAB);
   tabstrip_->MoveTab(from_model_index, to_model_index, data);
 }
 
-void BrowserTabStripController::TabChangedAt(TabContentsWrapper* contents,
+void BrowserTabStripController::TabChangedAt(TabContents* contents,
                                              int model_index,
                                              TabChangeType change_type) {
   if (change_type == TITLE_NOT_LOADING) {
     tabstrip_->TabTitleChangedNotLoading(model_index);
     // We'll receive another notification of the change asynchronously.
     return;
   }
 
   SetTabDataAt(contents, model_index);
 }
 
 void BrowserTabStripController::TabReplacedAt(TabStripModel* tab_strip_model,
-                                              TabContentsWrapper* old_contents,
-                                              TabContentsWrapper* new_contents,
+                                              TabContents* old_contents,
+                                              TabContents* new_contents,
                                               int model_index) {
   SetTabDataAt(new_contents, model_index);
 }
 
 void BrowserTabStripController::TabPinnedStateChanged(
-    TabContentsWrapper* contents,
+    TabContents* contents,
     int model_index) {
   // Currently none of the renderers render pinned state differently.
 }
 
 void BrowserTabStripController::TabMiniStateChanged(
-    TabContentsWrapper* contents,
+    TabContents* contents,
     int model_index) {
   SetTabDataAt(contents, model_index);
 }
 
 void BrowserTabStripController::TabBlockedStateChanged(
-    TabContentsWrapper* contents,
+    TabContents* contents,
     int model_index) {
   SetTabDataAt(contents, model_index);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserTabStripController, content::NotificationObserver implementation:
 
 void BrowserTabStripController::Observe(int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
@@ skipping 20 matching lines @@
       break;
   }
 }
 
 void BrowserTabStripController::SetTabRendererDataFromModel(
     WebContents* contents,
     int model_index,
     TabRendererData* data,
     TabStatus tab_status) {
   SkBitmap* app_icon = NULL;
-  TabContentsWrapper* wrapper =
-      TabContentsWrapper::GetCurrentWrapperForContents(contents);
+  TabContents* tab_contents = TabContents::FromWebContents(contents);
 
   // Extension App icons are slightly larger than favicons, so only allow
   // them if permitted by the model.
   if (model_->delegate()->LargeIconsPermitted())
-    app_icon = wrapper->extension_tab_helper()->GetExtensionAppIcon();
+    app_icon = tab_contents->extension_tab_helper()->GetExtensionAppIcon();
 
   if (app_icon)
     data->favicon = *app_icon;
   else
-    data->favicon = wrapper->favicon_tab_helper()->GetFavicon();
+    data->favicon = tab_contents->favicon_tab_helper()->GetFavicon();
   data->network_state = TabContentsNetworkState(contents);
   data->title = contents->GetTitle();
   data->url = contents->GetURL();
   data->loading = contents->IsLoading();
   data->crashed_status = contents->GetCrashedStatus();
   data->incognito = contents->GetBrowserContext()->IsOffTheRecord();
-  data->show_icon = wrapper->favicon_tab_helper()->ShouldDisplayFavicon();
+  data->show_icon = tab_contents->favicon_tab_helper()->ShouldDisplayFavicon();
   data->mini = model_->IsMiniTab(model_index);
   data->blocked = model_->IsTabBlocked(model_index);
-  data->app = wrapper->extension_tab_helper()->is_app();
+  data->app = tab_contents->extension_tab_helper()->is_app();
 }
 
 void BrowserTabStripController::SetTabDataAt(
-    TabContentsWrapper* contents,
+    TabContents* contents,
     int model_index) {
   TabRendererData data;
   SetTabRendererDataFromModel(contents->web_contents(), model_index, &data,
                               EXISTING_TAB);
   tabstrip_->SetTabData(model_index, data);
 }
 
 void BrowserTabStripController::StartHighlightTabsForCommand(
     TabStripModel::ContextMenuCommand command_id,
     BaseTab* tab) {
@@ skipping 14 matching lines @@
 void BrowserTabStripController::StopHighlightTabsForCommand(
     TabStripModel::ContextMenuCommand command_id,
     BaseTab* tab) {
   if (command_id == TabStripModel::CommandCloseTabsToRight ||
       command_id == TabStripModel::CommandCloseOtherTabs) {
     // Just tell all Tabs to stop pulsing - it's safe.
     tabstrip_->StopAllHighlighting();
   }
 }
 
-void BrowserTabStripController::AddTab(TabContentsWrapper* contents,
+void BrowserTabStripController::AddTab(TabContents* contents,
                                        int index,
                                        bool is_active) {
   // Cancel any pending tab transition.
   hover_tab_selector_.CancelTabTransition();
 
   TabRendererData data;
   SetTabRendererDataFromModel(contents->web_contents(), index, &data, NEW_TAB);
   tabstrip_->AddTabAt(index, data, is_active);
 }
 
 void BrowserTabStripController::UpdateLayoutType() {
   bool adjust_layout = false;
   TabStripLayoutType layout_type =
       DetermineTabStripLayout(g_browser_process->local_state(), &adjust_layout);
   tabstrip_->SetLayoutType(layout_type, adjust_layout);
 }