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

Side by Side Diff: content/browser/renderer_host/render_process_host_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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Represents the browser side of the browser <--> renderer communication 5 // Represents the browser side of the browser <--> renderer communication
6 // channel. There will be one RenderProcessHost per renderer process. 6 // channel. There will be one RenderProcessHost per renderer process.
7 7
8 #include "content/browser/renderer_host/render_process_host_impl.h" 8 #include "content/browser/renderer_host/render_process_host_impl.h"
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 983 matching lines...) Expand 10 before | Expand all | Expand 10 after
994 994
995 AppendGpuCommandLineFlags(command_line); 995 AppendGpuCommandLineFlags(command_line);
996 } 996 }
997 997
998 void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( 998 void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
999 const CommandLine& browser_cmd, 999 const CommandLine& browser_cmd,
1000 CommandLine* renderer_cmd) const { 1000 CommandLine* renderer_cmd) const {
1001 // Propagate the following switches to the renderer command line (along 1001 // Propagate the following switches to the renderer command line (along
1002 // with any associated values) if present in the browser command line. 1002 // with any associated values) if present in the browser command line.
1003 static const char* const kSwitchNames[] = { 1003 static const char* const kSwitchNames[] = {
1004 switches::kAllowInsecureWebSocketFromHttpsOrigin,
1004 switches::kAllowLoopbackInPeerConnection, 1005 switches::kAllowLoopbackInPeerConnection,
1005 switches::kAudioBufferSize, 1006 switches::kAudioBufferSize,
1006 switches::kAuditAllHandles, 1007 switches::kAuditAllHandles,
1007 switches::kAuditHandles, 1008 switches::kAuditHandles,
1008 switches::kBlinkPlatformLogChannels, 1009 switches::kBlinkPlatformLogChannels,
1009 switches::kBlockCrossSiteDocuments, 1010 switches::kBlockCrossSiteDocuments,
1010 switches::kDefaultTileWidth, 1011 switches::kDefaultTileWidth,
1011 switches::kDefaultTileHeight, 1012 switches::kDefaultTileHeight,
1012 switches::kDisable3DAPIs, 1013 switches::kDisable3DAPIs,
1013 switches::kDisableAcceleratedFixedRootBackground, 1014 switches::kDisableAcceleratedFixedRootBackground,
(...skipping 1050 matching lines...) Expand 10 before | Expand all | Expand 10 after
2064 mojo::ScopedMessagePipeHandle handle) { 2065 mojo::ScopedMessagePipeHandle handle) {
2065 if (!mojo_application_host_->did_activate()) 2066 if (!mojo_application_host_->did_activate())
2066 mojo_application_host_->Activate(this, GetHandle()); 2067 mojo_application_host_->Activate(this, GetHandle());
2067 2068
2068 mojo::AllocationScope scope; 2069 mojo::AllocationScope scope;
2069 mojo_application_host_->shell_client()->AcceptConnection(service_name, 2070 mojo_application_host_->shell_client()->AcceptConnection(service_name,
2070 handle.Pass()); 2071 handle.Pass());
2071 } 2072 }
2072 2073
2073 } // namespace content 2074 } // namespace content
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698