TabContentsWrapper -> TabContents, part 48.

chrome/browser/ui/views/ash/launcher/browser_launcher_item_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_ASH_LAUNCHER_BROWSER_LAUNCHER_ITEM_CONTROLLER_H_
 #define CHROME_BROWSER_UI_VIEWS_ASH_LAUNCHER_BROWSER_LAUNCHER_ITEM_CONTROLLER_H_
 #pragma once
 
 #include <string>
 
 #include "ash/launcher/launcher_types.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
 #include "chrome/browser/ui/views/ash/launcher/launcher_favicon_loader.h"
 #include "ui/aura/window_observer.h"
 
 class Browser;
 class ChromeLauncherController;
 class LauncherFaviconLoader;
 class TabContents;
-typedef TabContents TabContentsWrapper;
 
 namespace ash {
 class LauncherModel;
 }
 
 namespace aura {
 class Window;
 }
 
 // BrowserLauncherItemController is responsible for keeping the launcher
@@ skipping 45 matching lines @@
 
   LauncherFaviconLoader* favicon_loader() const {
     return favicon_loader_.get();
   }
 
   // Call to indicate that the window the tabcontents are in has changed its
   // activation state.
   void BrowserActivationStateChanged();
 
   // TabStripModel overrides:
-  virtual void ActiveTabChanged(TabContentsWrapper* old_contents,
-                                TabContentsWrapper* new_contents,
+  virtual void ActiveTabChanged(TabContents* old_contents,
+                                TabContents* new_contents,
                                 int index,
                                 bool user_gesture) OVERRIDE;
   virtual void TabChangedAt(
-      TabContentsWrapper* tab,
+      TabContents* tab,
       int index,
       TabStripModelObserver::TabChangeType change_type) OVERRIDE;
 
   // LauncherFaviconLoader::Delegate overrides:
   virtual void FaviconUpdated() OVERRIDE;
 
   // aura::WindowObserver overrides:
   virtual void OnWindowPropertyChanged(aura::Window* window,
                                        const void* key,
                                        intptr_t old) OVERRIDE;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(BrowserLauncherItemControllerTest, PanelItem);
 
   // Used to identify what an update corresponds to.
   enum UpdateType {
     UPDATE_TAB_REMOVED,
     UPDATE_TAB_CHANGED,
     UPDATE_TAB_INSERTED,
   };
 
   // Updates the launcher item status base on the activation and attention
   // state of the window.
   void UpdateItemStatus();
 
   // Updates the launcher from |tab|.
-  void UpdateLauncher(TabContentsWrapper* tab);
+  void UpdateLauncher(TabContents* tab);
 
   ash::LauncherModel* launcher_model();
 
   // Browser window we're in.
   aura::Window* window_;
 
   TabStripModel* tab_model_;
 
   ChromeLauncherController* launcher_controller_;
 
   // Whether this corresponds to an app or tabbed browser.
   const Type type_;
 
   const std::string app_id_;
 
   // Whether this is associated with an incognito profile.
   const bool is_incognito_;
 
   // ID of the item.
   ash::LauncherID item_id_;
 
   // Loads launcher sized favicons for panels.
   scoped_ptr<LauncherFaviconLoader> favicon_loader_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserLauncherItemController);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_ASH_LAUNCHER_BROWSER_LAUNCHER_ITEM_CONTROLLER_H_