diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-29 18:37:44 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-29 18:37:44 +0000 |
| commit | c442e9fe2a67bbc9dc4c0d09709649fec2fa0546 (patch) | |
| tree | 947b2f382b2447e73ccfa669889c318ae9c890e3 /chrome_frame/chrome_frame_activex.h | |
| parent | 0fab7cdd43e7dd01e69ef5f9c13f5eae6bd54853 (diff) | |
| download | chromium_src-c442e9fe2a67bbc9dc4c0d09709649fec2fa0546.zip chromium_src-c442e9fe2a67bbc9dc4c0d09709649fec2fa0546.tar.gz chromium_src-c442e9fe2a67bbc9dc4c0d09709649fec2fa0546.tar.bz2 | |
Fresh ChromeFrame installs triggered via wave required IE to be restarted for wave to switch to Chrome in the current page/tab.
The ChromeFrame install flow instantiates the ChromeFrame ActiveX which ensures that the IMoniker patches are in place for switching
to work. However ChromeFrame relies on the BHO to be loaded in order to determine that a URL is a top level URL.
The ChromeFrame ActiveX now attempts to load the BHO dynamically and registers it with the top level IWebBrowser for the page.
This fixes bug http://code.google.com/p/chromium/issues/detail?id=42790
Bug=42790
Review URL: http://codereview.chromium.org/1789007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45969 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_activex.h')
| -rw-r--r-- | chrome_frame/chrome_frame_activex.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome_frame/chrome_frame_activex.h b/chrome_frame/chrome_frame_activex.h index dec399e..35f866c 100644 --- a/chrome_frame/chrome_frame_activex.h +++ b/chrome_frame/chrome_frame_activex.h @@ -136,6 +136,11 @@ END_MSG_MAP() // Installs a hook on the top-level window hosting the control. HRESULT InstallTopLevelHook(IOleClientSite* client_site); + // On a fresh install of ChromeFrame the BHO will not be loaded in existing + // IE tabs/windows. This function instantiates the BHO and registers it + // explicitly. + HRESULT RegisterBHOIfNeeded(IOleClientSite* client_site); + // A hook attached to the top-level window containing the ActiveX control. HHOOK chrome_wndproc_hook_; }; |