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

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

Issue 1309243004: Reland again [Startup Tracing] Add --trace-config-file flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix unit test Created 5 years, 3 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 | « content/browser/plugin_process_host.cc ('k') | mandoline/app/DEPS » ('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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 1331 matching lines...) Expand 10 before | Expand all | Expand 10 after
1342 switches::kReduceSecurityForTesting, 1342 switches::kReduceSecurityForTesting,
1343 switches::kRegisterPepperPlugins, 1343 switches::kRegisterPepperPlugins,
1344 switches::kRendererStartupDialog, 1344 switches::kRendererStartupDialog,
1345 switches::kRootLayerScrolls, 1345 switches::kRootLayerScrolls,
1346 switches::kShowPaintRects, 1346 switches::kShowPaintRects,
1347 switches::kSitePerProcess, 1347 switches::kSitePerProcess,
1348 switches::kStatsCollectionController, 1348 switches::kStatsCollectionController,
1349 switches::kTestType, 1349 switches::kTestType,
1350 switches::kTouchEvents, 1350 switches::kTouchEvents,
1351 switches::kTouchTextSelectionStrategy, 1351 switches::kTouchTextSelectionStrategy,
1352 switches::kTraceConfigFile,
1352 switches::kTraceToConsole, 1353 switches::kTraceToConsole,
1353 // This flag needs to be propagated to the renderer process for 1354 // This flag needs to be propagated to the renderer process for
1354 // --in-process-webgl. 1355 // --in-process-webgl.
1355 switches::kUseGL, 1356 switches::kUseGL,
1356 switches::kUseMobileUserAgent, 1357 switches::kUseMobileUserAgent,
1357 switches::kUseNormalPriorityForTileTaskWorkerThreads, 1358 switches::kUseNormalPriorityForTileTaskWorkerThreads,
1358 switches::kV, 1359 switches::kV,
1359 switches::kVideoThreads, 1360 switches::kVideoThreads,
1360 switches::kVideoUnderflowThresholdMs, 1361 switches::kVideoUnderflowThresholdMs,
1361 switches::kVModule, 1362 switches::kVModule,
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
1411 switches::kOzonePlatform, 1412 switches::kOzonePlatform,
1412 #endif 1413 #endif
1413 #if defined(OS_CHROMEOS) 1414 #if defined(OS_CHROMEOS)
1414 switches::kDisableVaapiAcceleratedVideoEncode, 1415 switches::kDisableVaapiAcceleratedVideoEncode,
1415 #endif 1416 #endif
1416 }; 1417 };
1417 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames, 1418 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames,
1418 arraysize(kSwitchNames)); 1419 arraysize(kSwitchNames));
1419 1420
1420 if (browser_cmd.HasSwitch(switches::kTraceStartup) && 1421 if (browser_cmd.HasSwitch(switches::kTraceStartup) &&
1421 BrowserMainLoop::GetInstance()->is_tracing_startup()) { 1422 BrowserMainLoop::GetInstance()->is_tracing_startup_for_duration()) {
1422 // Pass kTraceStartup switch to renderer only if startup tracing has not 1423 // Pass kTraceStartup switch to renderer only if startup tracing has not
1423 // finished. 1424 // finished.
1424 renderer_cmd->AppendSwitchASCII( 1425 renderer_cmd->AppendSwitchASCII(
1425 switches::kTraceStartup, 1426 switches::kTraceStartup,
1426 browser_cmd.GetSwitchValueASCII(switches::kTraceStartup)); 1427 browser_cmd.GetSwitchValueASCII(switches::kTraceStartup));
1427 } 1428 }
1428 1429
1429 #if defined(ENABLE_WEBRTC) 1430 #if defined(ENABLE_WEBRTC)
1430 // Only run the Stun trials in the first renderer. 1431 // Only run the Stun trials in the first renderer.
1431 if (!has_done_stun_trials && 1432 if (!has_done_stun_trials &&
(...skipping 1092 matching lines...) Expand 10 before | Expand all | Expand 10 after
2524 void RenderProcessHostImpl::GetAudioOutputControllers( 2525 void RenderProcessHostImpl::GetAudioOutputControllers(
2525 const GetAudioOutputControllersCallback& callback) const { 2526 const GetAudioOutputControllersCallback& callback) const {
2526 audio_renderer_host()->GetOutputControllers(callback); 2527 audio_renderer_host()->GetOutputControllers(callback);
2527 } 2528 }
2528 2529
2529 BluetoothDispatcherHost* RenderProcessHostImpl::GetBluetoothDispatcherHost() { 2530 BluetoothDispatcherHost* RenderProcessHostImpl::GetBluetoothDispatcherHost() {
2530 return bluetooth_dispatcher_host_.get(); 2531 return bluetooth_dispatcher_host_.get();
2531 } 2532 }
2532 2533
2533 } // namespace content 2534 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/plugin_process_host.cc ('k') | mandoline/app/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698