diff options
| author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-12 04:05:33 +0000 |
|---|---|---|
| committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-12 04:05:33 +0000 |
| commit | 25afcf1cf3f73d6380fbb17c4d4d2281a4812a89 (patch) | |
| tree | 20b3c91810cb289d8b3ada771f51f18a3d652d5b /chrome_frame | |
| parent | 7334b0159e538c343e6bac3b4a054ded4b21b384 (diff) | |
| download | chromium_src-25afcf1cf3f73d6380fbb17c4d4d2281a4812a89.zip chromium_src-25afcf1cf3f73d6380fbb17c4d4d2281a4812a89.tar.gz chromium_src-25afcf1cf3f73d6380fbb17c4d4d2281a4812a89.tar.bz2 | |
Do not load Chrome Frame into IE11+.
BUG=264800
R=robertshield@chromium.org
Review URL: https://codereview.chromium.org/67893002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234398 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/chrome_tab.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc index a54b88f..7f2f5a7 100644 --- a/chrome_frame/chrome_tab.cc +++ b/chrome_frame/chrome_tab.cc @@ -946,6 +946,11 @@ STDAPI DllCanUnloadNow() { STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) { chrome_frame::ScopedCrashReporting crash_reporting; + // IE 11+ are unsupported. + if (GetIEVersion() > IE_10) { + return CLASS_E_CLASSNOTAVAILABLE; + } + // If we found another module present when we were loaded, then delegate to // that: if (g_dll_get_class_object_redir_ptr) { |