diff options
author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-11 03:47:43 +0000 |
---|---|---|
committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-11 03:47:43 +0000 |
commit | 7ab36c4f07b585449febcc6f2c59a9f5a0a40eed (patch) | |
tree | 72c59f9c527a7276fa7d94d7d7ba0e9d31c320af /chrome_frame/protocol_sink_wrap.cc | |
parent | db1cad416f942052953deda261035186535349c9 (diff) | |
download | chromium_src-7ab36c4f07b585449febcc6f2c59a9f5a0a40eed.zip chromium_src-7ab36c4f07b585449febcc6f2c59a9f5a0a40eed.tar.gz chromium_src-7ab36c4f07b585449febcc6f2c59a9f5a0a40eed.tar.bz2 |
Support GCF as the default HTML viewer as well as supporting an exclusion list.
Now, there are two URL lists that we support and a master REG_DWORD value ("IsDefaultRenderer" ) to switch between them.
Note that the OptInUrls key is no longer supported but the URL lists mentioned below function in the same way OptInUrls used to.
This is basically how it works:
if IsDefaultRenderer
Url list name is "RenderInHostUrls" and lists patterns that the host (IE) should render.
if not IsDefaultRenderer (i.e. it's 0)
Url list name is "RenderInGcfUrls" and lists patterns that GCF should render.
Also fixing typo :)
TEST=See description above and in bug report.
BUG= 50788
Review URL: http://codereview.chromium.org/3131003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55664 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, 4 insertions, 4 deletions
diff --git a/chrome_frame/protocol_sink_wrap.cc b/chrome_frame/protocol_sink_wrap.cc index 7080597..3388b16 100644 --- a/chrome_frame/protocol_sink_wrap.cc +++ b/chrome_frame/protocol_sink_wrap.cc @@ -420,7 +420,7 @@ HRESULT ProtData::ReportProgress(IInternetProtocolSink* delegate, } else if (renderer_type_ == OTHER) { // Suggested mime type is not "text/html" - we are not interested in // this request anymore. - FireSugestedMimeType(delegate); + FireSuggestedMimeType(delegate); } else { // Suggested mime type is "text/html"; We will try to sniff the // HTML content in ReportData. @@ -460,7 +460,7 @@ HRESULT ProtData::ReportData(IInternetProtocolSink* delegate, } if (renderer_type_ == OTHER) { - FireSugestedMimeType(delegate); + FireSuggestedMimeType(delegate); } // This is the first data notification we forward, since up to now we hold @@ -481,7 +481,7 @@ HRESULT ProtData::ReportResult(IInternetProtocolSink* delegate, HRESULT result, if (renderer_type_ == UNDETERMINED) { DLOG(INFO) << "ReportResult received but renderer type is yet unknown."; renderer_type_ = OTHER; - FireSugestedMimeType(delegate); + FireSuggestedMimeType(delegate); } HRESULT hr = S_OK; @@ -517,7 +517,7 @@ void ProtData::SaveSuggestedMimeType(LPCWSTR status_text) { suggested_mime_type_.Allocate(status_text); } -void ProtData::FireSugestedMimeType(IInternetProtocolSink* delegate) { +void ProtData::FireSuggestedMimeType(IInternetProtocolSink* delegate) { if (has_server_mime_type_) { DLOG(INFO) << "Forwarding BINDSTATUS_SERVER_MIMETYPEAVAILABLE " << suggested_mime_type_; |