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

Side by Side Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 887223005: Skip interstitials and don't block requests for localhost SSL errors (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes from previous round of feedback Created 5 years, 10 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
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 1164 matching lines...) Expand 10 before | Expand all | Expand 10 after
1175 1175
1176 AppendCompositorCommandLineFlags(command_line); 1176 AppendCompositorCommandLineFlags(command_line);
1177 } 1177 }
1178 1178
1179 void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( 1179 void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
1180 const base::CommandLine& browser_cmd, 1180 const base::CommandLine& browser_cmd,
1181 base::CommandLine* renderer_cmd) const { 1181 base::CommandLine* renderer_cmd) const {
1182 // Propagate the following switches to the renderer command line (along 1182 // Propagate the following switches to the renderer command line (along
1183 // with any associated values) if present in the browser command line. 1183 // with any associated values) if present in the browser command line.
1184 static const char* const kSwitchNames[] = { 1184 static const char* const kSwitchNames[] = {
1185 switches::kAllowInsecureLocalhost,
1185 switches::kAllowInsecureWebSocketFromHttpsOrigin, 1186 switches::kAllowInsecureWebSocketFromHttpsOrigin,
1186 switches::kAllowLoopbackInPeerConnection, 1187 switches::kAllowLoopbackInPeerConnection,
1187 switches::kAudioBufferSize, 1188 switches::kAudioBufferSize,
1188 switches::kAuditAllHandles, 1189 switches::kAuditAllHandles,
1189 switches::kAuditHandles, 1190 switches::kAuditHandles,
1190 switches::kBlinkPlatformLogChannels, 1191 switches::kBlinkPlatformLogChannels,
1191 switches::kBlockCrossSiteDocuments, 1192 switches::kBlockCrossSiteDocuments,
1192 switches::kDefaultTileWidth, 1193 switches::kDefaultTileWidth,
1193 switches::kDefaultTileHeight, 1194 switches::kDefaultTileHeight,
1194 switches::kDisable3DAPIs, 1195 switches::kDisable3DAPIs,
(...skipping 1200 matching lines...) Expand 10 before | Expand all | Expand 10 after
2395 if (worker_ref_count_ == 0) 2396 if (worker_ref_count_ == 0)
2396 Cleanup(); 2397 Cleanup();
2397 } 2398 }
2398 2399
2399 void RenderProcessHostImpl::GetAudioOutputControllers( 2400 void RenderProcessHostImpl::GetAudioOutputControllers(
2400 const GetAudioOutputControllersCallback& callback) const { 2401 const GetAudioOutputControllersCallback& callback) const {
2401 audio_renderer_host()->GetOutputControllers(callback); 2402 audio_renderer_host()->GetOutputControllers(callback);
2402 } 2403 }
2403 2404
2404 } // namespace content 2405 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698