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

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

Issue 1087733002: Revert "Add option to export tracing events to ETW." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « content/app/content_main_runner.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 1363 matching lines...) Expand 10 before | Expand all | Expand 10 after
1374 switches::kRendererWaitForJavaDebugger, 1374 switches::kRendererWaitForJavaDebugger,
1375 #endif 1375 #endif
1376 #if defined(OS_MACOSX) 1376 #if defined(OS_MACOSX)
1377 // Allow this to be set when invoking the browser and relayed along. 1377 // Allow this to be set when invoking the browser and relayed along.
1378 switches::kEnableSandboxLogging, 1378 switches::kEnableSandboxLogging,
1379 #endif 1379 #endif
1380 #if defined(OS_WIN) 1380 #if defined(OS_WIN)
1381 switches::kDisableDirectWrite, 1381 switches::kDisableDirectWrite,
1382 switches::kEnableWin32kRendererLockDown, 1382 switches::kEnableWin32kRendererLockDown,
1383 switches::kDisableWin32kRendererLockDown, 1383 switches::kDisableWin32kRendererLockDown,
1384 switches::kTraceExportEventsToETW,
1385 #endif 1384 #endif
1386 #if defined(OS_CHROMEOS) 1385 #if defined(OS_CHROMEOS)
1387 switches::kDisableVaapiAcceleratedVideoEncode, 1386 switches::kDisableVaapiAcceleratedVideoEncode,
1388 #endif 1387 #endif
1389 }; 1388 };
1390 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames, 1389 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames,
1391 arraysize(kSwitchNames)); 1390 arraysize(kSwitchNames));
1392 1391
1393 if (browser_cmd.HasSwitch(switches::kTraceStartup) && 1392 if (browser_cmd.HasSwitch(switches::kTraceStartup) &&
1394 BrowserMainLoop::GetInstance()->is_tracing_startup()) { 1393 BrowserMainLoop::GetInstance()->is_tracing_startup()) {
(...skipping 1086 matching lines...) Expand 10 before | Expand all | Expand 10 after
2481 if (worker_ref_count_ == 0) 2480 if (worker_ref_count_ == 0)
2482 Cleanup(); 2481 Cleanup();
2483 } 2482 }
2484 2483
2485 void RenderProcessHostImpl::GetAudioOutputControllers( 2484 void RenderProcessHostImpl::GetAudioOutputControllers(
2486 const GetAudioOutputControllersCallback& callback) const { 2485 const GetAudioOutputControllersCallback& callback) const {
2487 audio_renderer_host()->GetOutputControllers(callback); 2486 audio_renderer_host()->GetOutputControllers(callback);
2488 } 2487 }
2489 2488
2490 } // namespace content 2489 } // namespace content
OLDNEW
« no previous file with comments | « content/app/content_main_runner.cc ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698