diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-28 18:56:35 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-28 18:56:35 +0000 |
| commit | 785993e730139a6c5a93b69ca4dfdc313db59895 (patch) | |
| tree | 5a33a5b01a70bc344f438b84a1023d6ef8f8f12e /chrome_frame/chrome_frame_activex_base.h | |
| parent | 4d10edeb5f3db4366b4521c2346bfb4741c21e6f (diff) | |
| download | chromium_src-785993e730139a6c5a93b69ca4dfdc313db59895.zip chromium_src-785993e730139a6c5a93b69ca4dfdc313db59895.tar.gz chromium_src-785993e730139a6c5a93b69ca4dfdc313db59895.tar.bz2 | |
Reverting this to see if this fixes ChromeFrame tests. Please reland with the tests fixed.
Revert 64252 - 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
TBR=hansl@google.com
Review URL: http://codereview.chromium.org/4134008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64287 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, 0 insertions, 13 deletions
diff --git a/chrome_frame/chrome_frame_activex_base.h b/chrome_frame/chrome_frame_activex_base.h index 19c0ebf..def29b8 100644 --- a/chrome_frame/chrome_frame_activex_base.h +++ b/chrome_frame/chrome_frame_activex_base.h @@ -166,7 +166,6 @@ 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>, @@ -201,7 +200,6 @@ 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) @@ -891,17 +889,6 @@ 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; } |