summaryrefslogtreecommitdiffstats
path: root/chrome/browser/external_tab_container_win.h
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-12 17:30:58 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-12 17:30:58 +0000
commit6e47f2fed00e86f7579e040c2e02cb747a95913b (patch)
treead5c153a2246b2c821ae415ec10ba06f96587ad1 /chrome/browser/external_tab_container_win.h
parentb5558cf212f53fb81dbcbe522b5b2eede5d4641b (diff)
downloadchromium_src-6e47f2fed00e86f7579e040c2e02cb747a95913b.zip
chromium_src-6e47f2fed00e86f7579e040c2e02cb747a95913b.tar.gz
chromium_src-6e47f2fed00e86f7579e040c2e02cb747a95913b.tar.bz2
ChromeFrame would leave chrome processes running if a page rendered in Chrome would open up a popup window which
opened up in IE. This is because of an orphan external tab container created to handle the popup. This tab is destroyed in the normal case when the active document window is destroyed, which is the parent of the external tab container. However in this case the active document is destroyed without its window being created thus resulting in the external tab container lying around which holds a reference to the automation provider. Fix is to pass the ChromeFrameAutomationClient window as the parent window in the AutomationMsg_ConnectExternalTab message. Fixes bug http://code.google.com/p/chromium/issues/detail?id=48732 Bug=48732 Covered by ChromeFrame test FullTabNavigationTest.JavascriptWindowOpenDifferentDomain Review URL: http://codereview.chromium.org/2911006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52094 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/external_tab_container_win.h')
-rw-r--r--chrome/browser/external_tab_container_win.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/external_tab_container_win.h b/chrome/browser/external_tab_container_win.h
index 731f07d..f9a51d0 100644
--- a/chrome/browser/external_tab_container_win.h
+++ b/chrome/browser/external_tab_container_win.h
@@ -79,7 +79,8 @@ class ExternalTabContainer : public TabContentsDelegate,
// for this container. Typically used when an ExternalTabContainer
// instance is created by Chrome and attached to an automation client.
bool Reinitialize(AutomationProvider* automation_provider,
- AutomationResourceMessageFilter* filter);
+ AutomationResourceMessageFilter* filter,
+ gfx::NativeWindow parent_window);
// This is invoked when the external host reflects back to us a keyboard
// message it did not process