summaryrefslogtreecommitdiffstats
path: root/chrome_frame/chrome_active_document.cc
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-02 16:54:22 +0000
committerjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-02 16:54:22 +0000
commit3eafbfb9c01b23f85086cb8946700fe8baedb127 (patch)
tree4b1fbe86ffe3eb56419c7edd1224075f698e560a /chrome_frame/chrome_active_document.cc
parent51d6cf4e2ce5e34af1f5b059653d47b862cee485 (diff)
downloadchromium_src-3eafbfb9c01b23f85086cb8946700fe8baedb127.zip
chromium_src-3eafbfb9c01b23f85086cb8946700fe8baedb127.tar.gz
chromium_src-3eafbfb9c01b23f85086cb8946700fe8baedb127.tar.bz2
Allow non-IE hosts to handle accelerators without having to
implement the huge IBrowserService2 interface. BUG=none TEST=none Review URL: http://codereview.chromium.org/2847071 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54550 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_active_document.cc')
-rw-r--r--chrome_frame/chrome_active_document.cc13
1 files changed, 12 insertions, 1 deletions
diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc
index 132d529..49439d9 100644
--- a/chrome_frame/chrome_active_document.cc
+++ b/chrome_frame/chrome_active_document.cc
@@ -497,6 +497,18 @@ STDMETHODIMP ChromeActiveDocument::Next(BSTR* url, BSTR* policy,
return S_OK;
}
+HRESULT ChromeActiveDocument::GetInPlaceFrame(
+ IOleInPlaceFrame** in_place_frame) {
+ DCHECK(in_place_frame);
+ if (in_place_frame_) {
+ *in_place_frame = in_place_frame_.get();
+ (*in_place_frame)->AddRef();
+ return S_OK;
+ } else {
+ return S_FALSE;
+ }
+}
+
HRESULT ChromeActiveDocument::IOleObject_SetClientSite(
IOleClientSite* client_site) {
if (client_site == NULL) {
@@ -515,7 +527,6 @@ HRESULT ChromeActiveDocument::IOleObject_SetClientSite(
doc_host_handler->HideUI();
doc_site_.Release();
- in_place_frame_.Release();
}
if (client_site != m_spClientSite)