diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-04 23:07:40 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-04 23:07:40 +0000 |
| commit | 5ac670a3a8c4e3e2f2b7ed3ad1190f9ed34dd512 (patch) | |
| tree | cff9275bd93bc02c09e2d9836a82b086745a9852 /chrome_frame/protocol_sink_wrap.cc | |
| parent | 10da830b7fe028f85cf2167fadb64852cfe526ee (diff) | |
| download | chromium_src-5ac670a3a8c4e3e2f2b7ed3ad1190f9ed34dd512.zip chromium_src-5ac670a3a8c4e3e2f2b7ed3ad1190f9ed34dd512.tar.gz chromium_src-5ac670a3a8c4e3e2f2b7ed3ad1190f9ed34dd512.tar.bz2 | |
Policy support for being able to specify a list of content types that Chrome Frame should handle.
TEST=This adds a new policy list for Chrome Frame, "ChromeFrameContentTypes", which can be used to specify a list of content types that should always be rendered in Chrome Frame.
BUG=56543
Review URL: http://codereview.chromium.org/3611002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61432 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/protocol_sink_wrap.cc')
| -rw-r--r-- | chrome_frame/protocol_sink_wrap.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome_frame/protocol_sink_wrap.cc b/chrome_frame/protocol_sink_wrap.cc index ad46ca2..4b19bc0 100644 --- a/chrome_frame/protocol_sink_wrap.cc +++ b/chrome_frame/protocol_sink_wrap.cc @@ -17,6 +17,7 @@ #include "chrome_frame/bind_context_info.h" #include "chrome_frame/exception_barrier.h" #include "chrome_frame/function_stub.h" +#include "chrome_frame/policy_settings.h" #include "chrome_frame/utils.h" // BINDSTATUS_SERVER_MIMETYPEAVAILABLE == 54. Introduced in IE 8, so @@ -272,6 +273,12 @@ bool IsAdditionallySupportedContentType(const wchar_t* status_text) { return true; } + Singleton<PolicySettings> policy; + if (policy->GetRendererForContentType(status_text) == + PolicySettings::RENDER_IN_CHROME_FRAME) { + return true; + } + return false; } @@ -289,7 +296,6 @@ RendererType DetermineRendererTypeFromMetaData( const wchar_t* suggested_mime_type, const std::wstring& url, IWinInetHttpInfo* info) { - bool is_text_html = IsTextHtml(suggested_mime_type); bool is_supported_content_type = is_text_html || IsAdditionallySupportedContentType(suggested_mime_type); |