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

Side by Side Diff: content/browser/renderer_host/render_process_host_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, 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
« 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 1198 matching lines...) Expand 10 before | Expand all | Expand 10 after
1209 1209
1210 AppendCompositorCommandLineFlags(command_line); 1210 AppendCompositorCommandLineFlags(command_line);
1211 } 1211 }
1212 1212
1213 void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( 1213 void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
1214 const base::CommandLine& browser_cmd, 1214 const base::CommandLine& browser_cmd,
1215 base::CommandLine* renderer_cmd) const { 1215 base::CommandLine* renderer_cmd) const {
1216 // Propagate the following switches to the renderer command line (along 1216 // Propagate the following switches to the renderer command line (along
1217 // with any associated values) if present in the browser command line. 1217 // with any associated values) if present in the browser command line.
1218 static const char* const kSwitchNames[] = { 1218 static const char* const kSwitchNames[] = {
1219 switches::kAllowInsecureWebSocketFromHttpsOrigin,
1220 switches::kAllowLoopbackInPeerConnection, 1219 switches::kAllowLoopbackInPeerConnection,
1221 switches::kAudioBufferSize, 1220 switches::kAudioBufferSize,
1222 switches::kAuditAllHandles, 1221 switches::kAuditAllHandles,
1223 switches::kAuditHandles, 1222 switches::kAuditHandles,
1224 switches::kBlinkPlatformLogChannels, 1223 switches::kBlinkPlatformLogChannels,
1225 switches::kBlockCrossSiteDocuments, 1224 switches::kBlockCrossSiteDocuments,
1226 switches::kDefaultTileWidth, 1225 switches::kDefaultTileWidth,
1227 switches::kDefaultTileHeight, 1226 switches::kDefaultTileHeight,
1228 switches::kDisable3DAPIs, 1227 switches::kDisable3DAPIs,
1229 switches::kDisableAcceleratedJpegDecoding, 1228 switches::kDisableAcceleratedJpegDecoding,
(...skipping 1261 matching lines...) Expand 10 before | Expand all | Expand 10 after
2491 if (worker_ref_count_ == 0) 2490 if (worker_ref_count_ == 0)
2492 Cleanup(); 2491 Cleanup();
2493 } 2492 }
2494 2493
2495 void RenderProcessHostImpl::GetAudioOutputControllers( 2494 void RenderProcessHostImpl::GetAudioOutputControllers(
2496 const GetAudioOutputControllersCallback& callback) const { 2495 const GetAudioOutputControllersCallback& callback) const {
2497 audio_renderer_host()->GetOutputControllers(callback); 2496 audio_renderer_host()->GetOutputControllers(callback);
2498 } 2497 }
2499 2498
2500 } // namespace content 2499 } // 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