Minimal Chrome Frame with Aura.

chrome/browser/automation/automation_provider_win.cc

Index: chrome/browser/automation/automation_provider_win.cc
diff --git a/chrome/browser/automation/automation_provider_win.cc b/chrome/browser/automation/automation_provider_win.cc
index eaed51e837abae64e042fec36c94615471076b2a..0d6809b006b066eb41b8edd54af837f75906cae3 100644
--- a/chrome/browser/automation/automation_provider_win.cc
+++ b/chrome/browser/automation/automation_provider_win.cc
@@ -35,8 +35,10 @@ using content::WebContents;
 
 void AutomationProvider::CreateExternalTab(
     const ExternalTabSettings& settings,
-    gfx::NativeWindow* tab_container_window, gfx::NativeWindow* tab_window,
-    int* tab_handle, int* session_id) {
+    HWND* tab_container_window,
+    HWND* tab_window,
+    int* tab_handle,
+    int* session_id) {
   TRACE_EVENT_BEGIN_ETW("AutomationProvider::CreateExternalTab", 0, "");
 
   *tab_handle = 0;
@@ -62,8 +64,8 @@ void AutomationProvider::CreateExternalTab(
     SessionTabHelper* session_tab_helper =
         SessionTabHelper::FromWebContents(web_contents);
     *tab_handle = external_tab_container->GetTabHandle();
-    *tab_container_window = external_tab_container->GetExternalTabNativeView();
-    *tab_window = web_contents->GetNativeView();
+    *tab_container_window = external_tab_container->GetExternalTabHWND();
+    *tab_window = external_tab_container->GetContentHWND();
     *session_id = session_tab_helper->session_id().id();
   } else {
     external_tab_container->Uninitialize();
@@ -117,15 +119,15 @@ void AutomationProvider::PrintAsync(int tab_handle) {
 ExternalTabContainer* AutomationProvider::GetExternalTabForHandle(int handle) {
   if (tab_tracker_->ContainsHandle(handle)) {
     NavigationController* tab = tab_tracker_->GetResource(handle);
-    return ExternalTabContainer::GetContainerForTab(
-        tab->GetWebContents()->GetNativeView());
+    return ExternalTabContainer::GetContainerForTab(tab->GetWebContents());
   }
 
   return NULL;
 }
 
 void AutomationProvider::OnTabReposition(
-    int tab_handle, const Reposition_Params& params) {
+    int tab_handle,
+    const Reposition_Params& params) {
   if (!tab_tracker_->ContainsHandle(tab_handle))
     return;
 
@@ -160,14 +162,13 @@ void AutomationProvider::OnForwardContextMenuCommandToChrome(int tab_handle,
     external_tab->ExecuteContextMenuCommand(command);
 }
 
-void AutomationProvider::ConnectExternalTab(
-    uint64 cookie,
-    bool allow,
-    gfx::NativeWindow parent_window,
-    gfx::NativeWindow* tab_container_window,
-    gfx::NativeWindow* tab_window,
-    int* tab_handle,
-    int* session_id) {
+void AutomationProvider::ConnectExternalTab(uint64 cookie,
+                                            bool allow,
+                                            HWND parent_window,
+                                            HWND* tab_container_window,
+                                            HWND* tab_window,
+                                            int* tab_handle,
+                                            int* session_id) {
   TRACE_EVENT_BEGIN_ETW("AutomationProvider::ConnectExternalTab", 0, "");
 
   *tab_handle = 0;
@@ -190,8 +191,8 @@ void AutomationProvider::ConnectExternalTab(
     SessionTabHelper* session_tab_helper =
         SessionTabHelper::FromWebContents(web_contents);
     *tab_handle = external_tab_container->GetTabHandle();
-    *tab_container_window = external_tab_container->GetExternalTabNativeView();
-    *tab_window = web_contents->GetNativeView();
+    *tab_container_window = external_tab_container->GetExternalTabHWND();
+    *tab_window = external_tab_container->GetContentHWND();
     *session_id = session_tab_helper->session_id().id();
   } else {
     external_tab_container->Uninitialize();