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

Unified Diff: chrome/browser/external_tab/external_tab_container.h

Issue 12220101: Minimal Chrome Frame with Aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert install_worker.cc to un-break win64 build Created 7 years, 10 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/external_tab/external_tab_container.h
diff --git a/chrome/browser/external_tab/external_tab_container.h b/chrome/browser/external_tab/external_tab_container.h
index d48c170a868cd985dc31f7d04511b6538e805487..4afaa6e7eb8fa4c66ea4d51b712d2fa0bff83cb3 100644
--- a/chrome/browser/external_tab/external_tab_container.h
+++ b/chrome/browser/external_tab/external_tab_container.h
@@ -34,14 +34,17 @@ class ExternalTabContainer : public base::RefCounted<ExternalTabContainer> {
AutomationResourceMessageFilter* filter);
// A helper method that retrieves the ExternalTabContainer object that
- // hosts the given tab window.
- static ExternalTabContainer* GetContainerForTab(HWND tab_window);
+ // hosts the given WebContents.
+ static ExternalTabContainer* GetContainerForTab(
+ content::WebContents* web_contents);
// Returns the ExternalTabContainer instance associated with the cookie
// passed in. It also erases the corresponding reference from the map.
// Returns NULL if we fail to find the cookie in the map.
static scoped_refptr<ExternalTabContainer> RemovePendingTab(uintptr_t cookie);
+ // Initializes the instance. This must be invoked before any other member
+ // functions.
virtual bool Init(Profile* profile,
HWND parent,
const gfx::Rect& bounds,
@@ -66,7 +69,7 @@ class ExternalTabContainer : public base::RefCounted<ExternalTabContainer> {
// instance is created by Chrome and attached to an automation client.
virtual bool Reinitialize(AutomationProvider* automation_provider,
AutomationResourceMessageFilter* filter,
- gfx::NativeWindow parent_window) = 0;
+ HWND parent_window) = 0;
// This is invoked when the external host reflects back to us a keyboard
// message it did not process.
@@ -79,9 +82,8 @@ class ExternalTabContainer : public base::RefCounted<ExternalTabContainer> {
virtual void RunUnloadHandlers(IPC::Message* reply_message) = 0;
virtual content::WebContents* GetWebContents() const = 0;
-
- // This is a wrapper for GetNativeView from ExternalTabContainerWin.
- virtual gfx::NativeView GetExternalTabNativeView() const = 0;
+ virtual HWND GetExternalTabHWND() const = 0;
+ virtual HWND GetContentHWND() const = 0;
virtual void SetTabHandle(int handle) = 0;
virtual int GetTabHandle() const = 0;

Powered by Google App Engine
This is Rietveld 408576698