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

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

Issue 1319093002: Revert of [Startup Tracing] Add --trace-config-file flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 1337 matching lines...) Expand 10 before | Expand all | Expand 10 after
1348 switches::kReduceSecurityForTesting, 1348 switches::kReduceSecurityForTesting,
1349 switches::kRegisterPepperPlugins, 1349 switches::kRegisterPepperPlugins,
1350 switches::kRendererStartupDialog, 1350 switches::kRendererStartupDialog,
1351 switches::kRootLayerScrolls, 1351 switches::kRootLayerScrolls,
1352 switches::kShowPaintRects, 1352 switches::kShowPaintRects,
1353 switches::kSitePerProcess, 1353 switches::kSitePerProcess,
1354 switches::kStatsCollectionController, 1354 switches::kStatsCollectionController,
1355 switches::kTestType, 1355 switches::kTestType,
1356 switches::kTouchEvents, 1356 switches::kTouchEvents,
1357 switches::kTouchTextSelectionStrategy, 1357 switches::kTouchTextSelectionStrategy,
1358 switches::kTraceConfigFile,
1359 switches::kTraceToConsole, 1358 switches::kTraceToConsole,
1360 // This flag needs to be propagated to the renderer process for 1359 // This flag needs to be propagated to the renderer process for
1361 // --in-process-webgl. 1360 // --in-process-webgl.
1362 switches::kUseGL, 1361 switches::kUseGL,
1363 switches::kUseMobileUserAgent, 1362 switches::kUseMobileUserAgent,
1364 switches::kUseNormalPriorityForTileTaskWorkerThreads, 1363 switches::kUseNormalPriorityForTileTaskWorkerThreads,
1365 switches::kV, 1364 switches::kV,
1366 switches::kVideoThreads, 1365 switches::kVideoThreads,
1367 switches::kVideoUnderflowThresholdMs, 1366 switches::kVideoUnderflowThresholdMs,
1368 switches::kVModule, 1367 switches::kVModule,
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
1419 switches::kOzonePlatform, 1418 switches::kOzonePlatform,
1420 #endif 1419 #endif
1421 #if defined(OS_CHROMEOS) 1420 #if defined(OS_CHROMEOS)
1422 switches::kDisableVaapiAcceleratedVideoEncode, 1421 switches::kDisableVaapiAcceleratedVideoEncode,
1423 #endif 1422 #endif
1424 }; 1423 };
1425 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames, 1424 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames,
1426 arraysize(kSwitchNames)); 1425 arraysize(kSwitchNames));
1427 1426
1428 if (browser_cmd.HasSwitch(switches::kTraceStartup) && 1427 if (browser_cmd.HasSwitch(switches::kTraceStartup) &&
1429 BrowserMainLoop::GetInstance()->is_tracing_startup_for_duration()) { 1428 BrowserMainLoop::GetInstance()->is_tracing_startup()) {
1430 // Pass kTraceStartup switch to renderer only if startup tracing has not 1429 // Pass kTraceStartup switch to renderer only if startup tracing has not
1431 // finished. 1430 // finished.
1432 renderer_cmd->AppendSwitchASCII( 1431 renderer_cmd->AppendSwitchASCII(
1433 switches::kTraceStartup, 1432 switches::kTraceStartup,
1434 browser_cmd.GetSwitchValueASCII(switches::kTraceStartup)); 1433 browser_cmd.GetSwitchValueASCII(switches::kTraceStartup));
1435 } 1434 }
1436 1435
1437 #if defined(ENABLE_WEBRTC) 1436 #if defined(ENABLE_WEBRTC)
1438 // Only run the Stun trials in the first renderer. 1437 // Only run the Stun trials in the first renderer.
1439 if (!has_done_stun_trials && 1438 if (!has_done_stun_trials &&
(...skipping 1094 matching lines...) Expand 10 before | Expand all | Expand 10 after
2534 void RenderProcessHostImpl::GetAudioOutputControllers( 2533 void RenderProcessHostImpl::GetAudioOutputControllers(
2535 const GetAudioOutputControllersCallback& callback) const { 2534 const GetAudioOutputControllersCallback& callback) const {
2536 audio_renderer_host()->GetOutputControllers(callback); 2535 audio_renderer_host()->GetOutputControllers(callback);
2537 } 2536 }
2538 2537
2539 BluetoothDispatcherHost* RenderProcessHostImpl::GetBluetoothDispatcherHost() { 2538 BluetoothDispatcherHost* RenderProcessHostImpl::GetBluetoothDispatcherHost() {
2540 return bluetooth_dispatcher_host_.get(); 2539 return bluetooth_dispatcher_host_.get();
2541 } 2540 }
2542 2541
2543 } // namespace content 2542 } // 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