summaryrefslogtreecommitdiffstats
path: root/chrome_frame/chrome_frame_activex_base.h
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-01 00:06:00 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-01 00:06:00 +0000
commite12a3b8ba0106b816db9f45a74ddd42f344a267d (patch)
treec5ed65d2eec1f311f8b868ef054489af79a5ef7f /chrome_frame/chrome_frame_activex_base.h
parent975126cdf52a2f56522cb549e5dae9a7281ef851 (diff)
downloadchromium_src-e12a3b8ba0106b816db9f45a74ddd42f344a267d.zip
chromium_src-e12a3b8ba0106b816db9f45a74ddd42f344a267d.tar.gz
chromium_src-e12a3b8ba0106b816db9f45a74ddd42f344a267d.tar.bz2
The chrome frame install script instantiates the chrome frame activex via the new ActiveXObject call, which causes it
to not receive the IOleObject_SetClientSite call. We now bootstrap our BHO in an explicit method call RegisterBHOIfNeeded Fixes bug http://code.google.com/p/chromium/issues/detail?id=42790 Bug=42790 Review URL: http://codereview.chromium.org/1823001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_activex_base.h')
-rw-r--r--chrome_frame/chrome_frame_activex_base.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome_frame/chrome_frame_activex_base.h b/chrome_frame/chrome_frame_activex_base.h
index fee5ba2..eb1391f 100644
--- a/chrome_frame/chrome_frame_activex_base.h
+++ b/chrome_frame/chrome_frame_activex_base.h
@@ -808,6 +808,10 @@ END_MSG_MAP()
return S_OK;
}
+ STDMETHOD(RegisterBHOIfNeeded)() {
+ return E_NOTIMPL;
+ }
+
// Returns the vector of event handlers for a given event (e.g. "load").
// If the event type isn't recognized, the function fills in a descriptive
// error (IErrorInfo) and returns E_INVALIDARG.