Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(856)

Unified Diff: chrome/browser/extensions/extension_tab_helper.h

Issue 10535077: TabContentsWrapper -> TabContents, part 12. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/extension_tab_helper.h
diff --git a/chrome/browser/extensions/extension_tab_helper.h b/chrome/browser/extensions/extension_tab_helper.h
index 66ed9f1bda94399316223517bb0fe9741d088cb7..6aa2bca758d9428e4f768ce66209f64bb0128b12 100644
--- a/chrome/browser/extensions/extension_tab_helper.h
+++ b/chrome/browser/extensions/extension_tab_helper.h
@@ -19,7 +19,6 @@
class ExtensionTabHelperDelegate;
class TabContents;
-typedef TabContents TabContentsWrapper;
struct WebApplicationInfo;
namespace content {
@@ -42,7 +41,7 @@ class ExtensionTabHelper
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.
@@ -91,8 +90,8 @@ class ExtensionTabHelper
// Extension::EXTENSION_ICON_SMALLISH).
SkBitmap* GetExtensionAppIcon();
- TabContentsWrapper* tab_contents_wrapper() {
- return wrapper_;
+ TabContents* tab_contents() {
+ return tab_contents_;
}
content::WebContents* web_contents() const {
@@ -188,7 +187,7 @@ class ExtensionTabHelper
// 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
« no previous file with comments | « chrome/browser/extensions/extension_startup_browsertest.cc ('k') | chrome/browser/extensions/extension_tab_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698