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

Unified Diff: content/renderer/render_view_impl.cc

Issue 1032603003: Remove allow-insecure-websocket-from-https-origin flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 9 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 | « content/public/common/content_switches.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 7e31a9f050b48180bce5b83fdc1b90db56062347..ddf0b80b0fe3f23b82bd08e72cb1509eabdb50c5 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -724,9 +724,6 @@ void RenderViewImpl::Initialize(const ViewMsg_New_Params& params,
ApplyWebPreferences(webkit_preferences_, webview());
- webview()->settings()->setAllowConnectingInsecureWebSocket(
- command_line.HasSwitch(switches::kAllowInsecureWebSocketFromHttpsOrigin));
-
RenderFrameProxy* proxy = NULL;
if (params.proxy_routing_id != MSG_ROUTING_NONE) {
CHECK(params.swapped_out);
« no previous file with comments | « content/public/common/content_switches.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698