| 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();
|
|
|