Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Unified Diff: chrome_frame/protocol_sink_wrap.cc

Issue 18770009: Added a new policy setting as well as corrisponding registry key to allow GCF users the option to d… (Closed) Base URL: https://src.chromium.org/chrome/trunk/src/
Patch Set: Uploading from *@workday.com Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/policy_settings.cc ('k') | chrome_frame/utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/protocol_sink_wrap.cc
===================================================================
--- chrome_frame/protocol_sink_wrap.cc (revision 217795)
+++ chrome_frame/protocol_sink_wrap.cc (working copy)
@@ -4,6 +4,7 @@
#include <htiframe.h>
#include <mshtml.h>
+#include <algorithm>
#include "chrome_frame/protocol_sink_wrap.h"
@@ -21,6 +22,8 @@
#include "chrome_frame/policy_settings.h"
#include "chrome_frame/utils.h"
+using std::min;
+
// BINDSTATUS_SERVER_MIMETYPEAVAILABLE == 54. Introduced in IE 8, so
// not in everyone's headers yet. See:
// http://msdn.microsoft.com/en-us/library/ms775133(VS.85,loband).aspx
@@ -478,7 +481,8 @@
last_chance = true;
}
- renderer_type_ = DetermineRendererType(buffer_, buffer_size_, last_chance);
+ renderer_type_ = SkipMetadataCheck() ? RENDERER_TYPE_OTHER
+ : DetermineRendererType(buffer_, buffer_size_, last_chance);
if (renderer_type_ == RENDERER_TYPE_UNDETERMINED) {
// do not report anything, we need more data.
« no previous file with comments | « chrome_frame/policy_settings.cc ('k') | chrome_frame/utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698