TabContentsWrapper -> TabContents, part 12.

chrome/browser/extensions/extension_tab_helper.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_EXTENSIONS_EXTENSION_TAB_HELPER_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_TAB_HELPER_H_
 #pragma once
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/browser/extensions/app_notify_channel_setup.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/extensions/webstore_inline_installer.h"
 #include "chrome/common/web_apps.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 class ExtensionTabHelperDelegate;
 class TabContents;
-typedef TabContents TabContentsWrapper;
 struct WebApplicationInfo;
 
 namespace content {
 struct LoadCommittedDetails;
 }
 
 namespace extensions {
 class Extension;
 class LocationBarController;
 class ScriptBadgeController;
 class ScriptExecutor;
 }
 
 // Per-tab extension helper. Also handles non-extension apps.
 class ExtensionTabHelper
     : public content::WebContentsObserver,
       public ExtensionFunctionDispatcher::Delegate,
       public ImageLoadingTracker::Observer,
       public WebstoreInlineInstaller::Delegate,
       public AppNotifyChannelSetup::Delegate,
       public base::SupportsWeakPtr<ExtensionTabHelper> {
  public:
-  explicit ExtensionTabHelper(TabContentsWrapper* wrapper);
+  explicit ExtensionTabHelper(TabContents* tab_contents);
   virtual ~ExtensionTabHelper();
 
   // Copies the internal state from another ExtensionTabHelper.
   void CopyStateFrom(const ExtensionTabHelper& source);
 
   ExtensionTabHelperDelegate* delegate() const { return delegate_; }
   void set_delegate(ExtensionTabHelperDelegate* d) { delegate_ = d; }
 
   // Call this after updating a page action to notify clients about the changes.
   void PageActionStateChanged();
@@ skipping 28 matching lines @@
     return web_app_info_;
   }
 
   // If an app extension has been explicitly set for this WebContents its icon
   // is returned.
   //
   // NOTE: the returned icon is larger than 16x16 (its size is
   // Extension::EXTENSION_ICON_SMALLISH).
   SkBitmap* GetExtensionAppIcon();
 
-  TabContentsWrapper* tab_contents_wrapper() {
-    return wrapper_;
+  TabContents* tab_contents() {
+    return tab_contents_;
   }
 
   content::WebContents* web_contents() const {
     return content::WebContentsObserver::web_contents();
   }
 
   extensions::ScriptExecutor* script_executor();
 
   extensions::LocationBarController* location_bar_controller();
 
@@ skipping 75 matching lines @@
 
   // Process any extension messages coming from the tab.
   ExtensionFunctionDispatcher extension_function_dispatcher_;
 
   // Used for loading extension_app_icon_.
   scoped_ptr<ImageLoadingTracker> extension_app_image_loader_;
 
   // Cached web app info data.
   WebApplicationInfo web_app_info_;
 
-  TabContentsWrapper* wrapper_;
+  TabContents* tab_contents_;
 
   // Either script_executor/location_bar_controller will have values, or
   // script_badge_controller will have a value, depending on whether the action
   // box is turned on.
   scoped_ptr<extensions::ScriptExecutor> script_executor_;
   scoped_ptr<extensions::LocationBarController> location_bar_controller_;
   scoped_refptr<extensions::ScriptBadgeController> script_badge_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionTabHelper);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_TAB_HELPER_H_