diff options
Diffstat (limited to 'chrome/browser')
| -rwxr-xr-x | chrome/browser/automation/automation_provider.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/automation/automation_provider.h | 4 | ||||
| -rw-r--r-- | chrome/browser/extensions/extension_uitest.cc | 5 |
3 files changed, 9 insertions, 3 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index dcb6afe..5b692b8 100755 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -2440,9 +2440,11 @@ void AutomationProvider::CreateExternalTab(HWND parent, unsigned int style, bool incognito, HWND* tab_container_window, + HWND* tab_window, int* tab_handle) { *tab_handle = 0; *tab_container_window = NULL; + *tab_window = NULL; ExternalTabContainer *external_tab_container = new ExternalTabContainer(this); Profile* profile = incognito? profile_->GetOffTheRecordProfile() : profile_; @@ -2452,6 +2454,7 @@ void AutomationProvider::CreateExternalTab(HWND parent, *tab_handle = tab_tracker_->Add(&tab_contents->controller()); external_tab_container->set_tab_handle(*tab_handle); *tab_container_window = external_tab_container->GetNativeView(); + *tab_window = tab_contents->GetNativeView(); } else { delete external_tab_container; } diff --git a/chrome/browser/automation/automation_provider.h b/chrome/browser/automation/automation_provider.h index 174faff..3dedd65 100644 --- a/chrome/browser/automation/automation_provider.h +++ b/chrome/browser/automation/automation_provider.h @@ -301,7 +301,9 @@ class AutomationProvider : public base::RefCounted<AutomationProvider>, #if defined(OS_WIN) void CreateExternalTab(HWND parent, const gfx::Rect& dimensions, unsigned int style, bool incognito, - HWND* tab_container_window, int* tab_handle); + HWND* tab_container_window, + HWND* tab_window, + int* tab_handle); #endif // defined(OS_WIN) void NavigateInExternalTab( diff --git a/chrome/browser/extensions/extension_uitest.cc b/chrome/browser/extensions/extension_uitest.cc index 102bbac..38a5bb6 100644 --- a/chrome/browser/extensions/extension_uitest.cc +++ b/chrome/browser/extensions/extension_uitest.cc @@ -52,8 +52,9 @@ class ExtensionUITest : public ParentTestType { void TestWithURL(const GURL& url) { HWND external_tab_container = NULL; - scoped_refptr<TabProxy> tab(automation()->CreateExternalTab(NULL, gfx::Rect(), - WS_POPUP, false, &external_tab_container)); + HWND tab_wnd = NULL; + scoped_refptr<TabProxy> tab(automation()->CreateExternalTab(NULL, + gfx::Rect(), WS_POPUP, false, &external_tab_container, &tab_wnd)); ASSERT_TRUE(tab != NULL); ASSERT_NE(FALSE, ::IsWindow(external_tab_container)); DoAdditionalPreNavigateSetup(tab.get()); |