diff options
| author | hansl@google.com <hansl@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-28 16:05:36 +0000 |
|---|---|---|
| committer | hansl@google.com <hansl@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-28 16:05:36 +0000 |
| commit | d57b6ab5930b827b56d412b1d334620c91e8cdbd (patch) | |
| tree | 7ec5d9867db431d3a89092fcebd2327078c64c16 /chrome_frame/chrome_frame_activex_base.h | |
| parent | 8073fb0ca593e537c75d1b40b7206b4f58434d86 (diff) | |
| download | chromium_src-d57b6ab5930b827b56d412b1d334620c91e8cdbd.zip chromium_src-d57b6ab5930b827b56d412b1d334620c91e8cdbd.tar.gz chromium_src-d57b6ab5930b827b56d412b1d334620c91e8cdbd.tar.bz2 | |
The ChromeFrame objects now provides an unfrozen interface called IChromeFramePrivate. This interface provides a GetSessionId() which returns the ID used by Chrome in its Tab javascript object.
Review URL: http://codereview.chromium.org/3541017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64252 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_activex_base.h')
| -rw-r--r-- | chrome_frame/chrome_frame_activex_base.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/chrome_frame/chrome_frame_activex_base.h b/chrome_frame/chrome_frame_activex_base.h index def29b8..19c0ebf 100644 --- a/chrome_frame/chrome_frame_activex_base.h +++ b/chrome_frame/chrome_frame_activex_base.h @@ -166,6 +166,7 @@ class ATL_NO_VTABLE ChromeFrameActivexBase : // NOLINT public com_util::IProvideClassInfo2Impl<class_id, DIID_DIChromeFrameEvents>, public com_util::IDispatchImpl<IChromeFrame>, + public IChromeFrameInternal, public IConnectionPointContainerImpl<T>, public ProxyDIChromeFrameEvents<T>, public IPropertyNotifySinkCP<T>, @@ -200,6 +201,7 @@ DECLARE_NOT_AGGREGATABLE(T) BEGIN_COM_MAP(ChromeFrameActivexBase) COM_INTERFACE_ENTRY(IChromeFrame) COM_INTERFACE_ENTRY(IDispatch) + COM_INTERFACE_ENTRY(IChromeFrameInternal) COM_INTERFACE_ENTRY(IViewObjectEx) COM_INTERFACE_ENTRY(IViewObject2) COM_INTERFACE_ENTRY(IViewObject) @@ -889,6 +891,17 @@ END_MSG_MAP() return S_OK; } + STDMETHOD(getSessionId)(int* session_id) { + DCHECK(automation_client_.get()); + if (!is_privileged_) { + DLOG(ERROR) << "Attempt to getSessionId in non-privileged mode"; + return E_ACCESSDENIED; + } + + *session_id = automation_client_->GetSessionId(); + return (*session_id) == -1 ? S_FALSE : S_OK; + } + STDMETHOD(registerBhoIfNeeded)() { return E_NOTIMPL; } |