summaryrefslogtreecommitdiffstats
path: root/ceee
diff options
context:
space:
mode:
authorericdingle@chromium.org <ericdingle@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-04 18:43:04 +0000
committerericdingle@chromium.org <ericdingle@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-04 18:43:04 +0000
commit9508698f4833e0e916707ad8c3fe9b2718344b66 (patch)
treea8b67a454e2097704bd88aa1e85ecbae139a574a /ceee
parent5784dba79230e8b47e9a9b5c3f288a3f8c04ba29 (diff)
downloadchromium_src-9508698f4833e0e916707ad8c3fe9b2718344b66.zip
chromium_src-9508698f4833e0e916707ad8c3fe9b2718344b66.tar.gz
chromium_src-9508698f4833e0e916707ad8c3fe9b2718344b66.tar.bz2
Fixed Chrome Frame CLSID check in BrowserHelperObject::BrowserContainsChromeFrame.
BUG=none TEST=none Review URL: http://codereview.chromium.org/4490002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65088 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ceee')
-rw-r--r--ceee/ie/plugin/bho/browser_helper_object.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/ceee/ie/plugin/bho/browser_helper_object.cc b/ceee/ie/plugin/bho/browser_helper_object.cc
index 7a9f4d7..6da154a 100644
--- a/ceee/ie/plugin/bho/browser_helper_object.cc
+++ b/ceee/ie/plugin/bho/browser_helper_object.cc
@@ -901,7 +901,8 @@ bool BrowserHelperObject::BrowserContainsChromeFrame(IWebBrowser2* browser) {
if (document_persist != NULL) {
CLSID clsid = {};
hr = document_persist->GetClassID(&clsid);
- if (SUCCEEDED(hr) && clsid == CLSID_ChromeFrame) {
+ if (SUCCEEDED(hr) && (clsid == CLSID_ChromeFrame ||
+ clsid == CLSID_ChromeActiveDocument)) {
return true;
}
}