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

Unified Diff: content/renderer/render_view_impl.cc

Issue 248863003: Add a chrome://flags item "allow-insecure-websocket-from-https-origin" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed #9 Created 6 years, 8 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 cf16222a557fb347343025f57071af484c634a1d..209b05c22d6d9b3350dd4e695e2b9c5a71315f19 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -775,6 +775,9 @@ void RenderViewImpl::Initialize(
ApplyWebPreferences(webkit_preferences_, webview());
+ webview()->settings()->setAllowConnectingInsecureWebSocket(
+ command_line.HasSwitch(switches::kAllowInsecureWebSocketFromHttpsOrigin));
+
main_render_frame_.reset(main_render_frame);
webview()->setMainFrame(main_render_frame_->GetWebFrame());
main_render_frame_->Initialize();
« 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