TabContentsWrapper -> TabContents, part 48.

chrome/browser/ui/views/ash/launcher/browser_launcher_item_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/ash/launcher/browser_launcher_item_controller.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.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_strip_model.h"
 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/ui_resources.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
 
 BrowserLauncherItemController::BrowserLauncherItemController(
@@ skipping 67 matching lines @@
           ChromeLauncherController::instance(), type, app_id);
   icon_updater->Init();
   return icon_updater;
 }
 
 void BrowserLauncherItemController::BrowserActivationStateChanged() {
   UpdateItemStatus();
 }
 
 void BrowserLauncherItemController::ActiveTabChanged(
-    TabContentsWrapper* old_contents,
-    TabContentsWrapper* new_contents,
+    TabContents* old_contents,
+    TabContents* new_contents,
     int index,
     bool user_gesture) {
   // Update immediately on a tab change.
   UpdateLauncher(new_contents);
 }
 
 void BrowserLauncherItemController::TabChangedAt(
-    TabContentsWrapper* tab,
+    TabContents* tab,
     int index,
     TabStripModelObserver::TabChangeType change_type) {
   if (index != tab_model_->active_index() ||
       !(change_type != TabStripModelObserver::LOADING_ONLY &&
         change_type != TabStripModelObserver::TITLE_NOT_LOADING)) {
     return;
   }
 
   if (tab->favicon_tab_helper()->FaviconIsValid() ||
       !tab->favicon_tab_helper()->ShouldDisplayFavicon()) {
@@ skipping 29 matching lines @@
       window_->SetProperty(aura::client::kDrawAttentionKey, false);
     status = ash::STATUS_ACTIVE;
   } else if (window_->GetProperty(aura::client::kDrawAttentionKey)) {
     status = ash::STATUS_ATTENTION;
   } else {
     status = ash::STATUS_RUNNING;
   }
   launcher_controller_->SetItemStatus(item_id_, status);
 }
 
-void BrowserLauncherItemController::UpdateLauncher(TabContentsWrapper* tab) {
+void BrowserLauncherItemController::UpdateLauncher(TabContents* tab) {
   if (type_ == TYPE_APP_PANEL)
     return;  // Maintained entirely by ChromeLauncherController.
 
   if (!tab)
     return;  // Assume the window is going to be closed if there are no tabs.
 
   int item_index = launcher_model()->ItemIndexByID(item_id_);
   if (item_index == -1)
     return;
 
@@ skipping 25 matching lines @@
     } else {
       item.image = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON);
     }
   }
   launcher_model()->Set(item_index, item);
 }
 
 ash::LauncherModel* BrowserLauncherItemController::launcher_model() {
   return launcher_controller_->model();
 }