Chromium Code Reviews| Index: chrome_frame/chrome_active_document.h |
| =================================================================== |
| --- chrome_frame/chrome_active_document.h (revision 68604) |
| +++ chrome_frame/chrome_active_document.h (working copy) |
| @@ -208,7 +208,8 @@ |
| public IPersistHistory, |
| public IEnumPrivacyRecords, |
| public HTMLWindowImpl<IHTMLWindow2>, |
| - public HTMLPrivateWindowImpl<IHTMLPrivateWindow> { |
| + public HTMLPrivateWindowImpl<IHTMLPrivateWindow>, |
| + public IMonikerProp { |
|
amit
2010/12/10 23:56:17
Please get rid of unrelated changes from this CL.
ananta
2010/12/11 02:11:11
Done.
|
| public: |
| typedef ChromeFrameActivexBase<ChromeActiveDocument, |
| CLSID_ChromeActiveDocument> BaseActiveX; |
| @@ -230,6 +231,7 @@ |
| COM_INTERFACE_ENTRY(IHTMLWindow2) |
| COM_INTERFACE_ENTRY(IHTMLPrivateWindow) |
| COM_INTERFACE_ENTRY(IEnumPrivacyRecords) |
| + COM_INTERFACE_ENTRY(IMonikerProp) |
| COM_INTERFACE_ENTRY_CHAIN(BaseActiveX) |
| END_COM_MAP() |
| @@ -337,6 +339,8 @@ |
| // IHTMLPrivateWindow methods |
| STDMETHOD(GetAddressBarUrl)(BSTR* url); |
| + STDMETHOD(PutProperty)(MONIKERPROPERTY moniker_prop, LPCWSTR value); |
| + |
| // ChromeFrameActivexBase overrides |
| HRESULT IOleObject_SetClientSite(IOleClientSite* client_site); |
| @@ -356,6 +360,9 @@ |
| STDMETHOD(GetPrivacyImpacted)(BOOL* privacy_impacted); |
| STDMETHOD(Next)(BSTR* url, BSTR* policy, LONG* reserved, DWORD* flags); |
| + // NavigationConstraints overrides. |
| + bool IsSchemeAllowed(const GURL& url); |
| + |
| // Accessor for InPlaceMenu. Returns S_OK if set, S_FALSE if NULL. |
| HRESULT GetInPlaceFrame(IOleInPlaceFrame** in_place_frame); |