summaryrefslogtreecommitdiffstats
path: root/chrome/browser/external_tab_container_win.h
diff options
context:
space:
mode:
authortommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-10 20:57:54 +0000
committertommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-10 20:57:54 +0000
commit7b8d4a285f8acfada8d6c90904c4ac3f5558bd44 (patch)
tree8209aa9b9795e58ea654d30cc87f0e62bdd45b4a /chrome/browser/external_tab_container_win.h
parent62e7190b0445dcc6f80b63149a8763f59c3a7cf0 (diff)
downloadchromium_src-7b8d4a285f8acfada8d6c90904c4ac3f5558bd44.zip
chromium_src-7b8d4a285f8acfada8d6c90904c4ac3f5558bd44.tar.gz
chromium_src-7b8d4a285f8acfada8d6c90904c4ac3f5558bd44.tar.bz2
Switch ExternalTabContainer over to TabContentsWrapper.
TEST=Should be no change (test Chrome Frame). BUG=none Review URL: http://codereview.chromium.org/6490006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74478 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/external_tab_container_win.h')
-rw-r--r--chrome/browser/external_tab_container_win.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/external_tab_container_win.h b/chrome/browser/external_tab_container_win.h
index bce994d..63a5958 100644
--- a/chrome/browser/external_tab_container_win.h
+++ b/chrome/browser/external_tab_container_win.h
@@ -28,6 +28,7 @@ class AutomationProvider;
class Browser;
class Profile;
class TabContentsContainer;
+class TabContentsWrapper;
class RenderViewContextMenuViews;
struct NavigationInfo;
@@ -52,7 +53,7 @@ class ExternalTabContainer : public TabContentsDelegate,
ExternalTabContainer(AutomationProvider* automation,
AutomationResourceMessageFilter* filter);
- TabContents* tab_contents() const { return tab_contents_; }
+ TabContents* tab_contents() const;
// Temporary hack so we can send notifications back
void SetTabHandle(int handle);
@@ -67,7 +68,7 @@ class ExternalTabContainer : public TabContentsDelegate,
DWORD style,
bool load_requests_via_automation,
bool handle_top_level_requests,
- TabContents* existing_tab_contents,
+ TabContentsWrapper* existing_tab_contents,
const GURL& initial_url,
const GURL& referrer,
bool infobars_enabled,
@@ -265,7 +266,7 @@ class ExternalTabContainer : public TabContentsDelegate,
// Creates and initializes the view hierarchy for this ExternalTabContainer.
void SetupExternalTabView();
- TabContents* tab_contents_;
+ scoped_ptr<TabContentsWrapper> tab_contents_;
scoped_refptr<AutomationProvider> automation_;
NotificationRegistrar registrar_;