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

Side by Side Diff: content/ppapi_plugin/ppapi_broker_main.cc

Issue 892213004: Mechanical rename of base::debug -> base::trace_event for /content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_trace_part3_1
Patch Set: Rebase. 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
« no previous file with comments | « content/plugin/plugin_main.cc ('k') | content/ppapi_plugin/ppapi_plugin_main.cc » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "base/message_loop/message_loop.h" 5 #include "base/message_loop/message_loop.h"
6 #include "base/threading/platform_thread.h" 6 #include "base/threading/platform_thread.h"
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 #include "content/child/child_process.h" 8 #include "content/child/child_process.h"
9 #include "content/common/content_constants_internal.h" 9 #include "content/common/content_constants_internal.h"
10 #include "content/ppapi_plugin/ppapi_thread.h" 10 #include "content/ppapi_plugin/ppapi_thread.h"
11 #include "content/public/common/content_switches.h" 11 #include "content/public/common/content_switches.h"
12 #include "content/public/common/main_function_params.h" 12 #include "content/public/common/main_function_params.h"
13 13
14 namespace content { 14 namespace content {
15 15
16 // Main function for starting the PPAPI broker process. 16 // Main function for starting the PPAPI broker process.
17 int PpapiBrokerMain(const MainFunctionParams& parameters) { 17 int PpapiBrokerMain(const MainFunctionParams& parameters) {
18 const base::CommandLine& command_line = parameters.command_line; 18 const base::CommandLine& command_line = parameters.command_line;
19 if (command_line.HasSwitch(switches::kPpapiStartupDialog)) { 19 if (command_line.HasSwitch(switches::kPpapiStartupDialog)) {
20 ChildProcess::WaitForDebugger("PpapiBroker"); 20 ChildProcess::WaitForDebugger("PpapiBroker");
21 } 21 }
22 22
23 base::MessageLoop main_message_loop; 23 base::MessageLoop main_message_loop;
24 base::PlatformThread::SetName("CrPPAPIBrokerMain"); 24 base::PlatformThread::SetName("CrPPAPIBrokerMain");
25 base::debug::TraceLog::GetInstance()->SetProcessName("PPAPI Broker Process"); 25 base::trace_event::TraceLog::GetInstance()->SetProcessName(
26 base::debug::TraceLog::GetInstance()->SetProcessSortIndex( 26 "PPAPI Broker Process");
27 base::trace_event::TraceLog::GetInstance()->SetProcessSortIndex(
27 kTraceEventPpapiBrokerProcessSortIndex); 28 kTraceEventPpapiBrokerProcessSortIndex);
28 29
29 ChildProcess ppapi_broker_process; 30 ChildProcess ppapi_broker_process;
30 ppapi_broker_process.set_main_thread( 31 ppapi_broker_process.set_main_thread(
31 new PpapiThread(parameters.command_line, true)); // Broker. 32 new PpapiThread(parameters.command_line, true)); // Broker.
32 33
33 main_message_loop.Run(); 34 main_message_loop.Run();
34 DVLOG(1) << "PpapiBrokerMain exiting"; 35 DVLOG(1) << "PpapiBrokerMain exiting";
35 return 0; 36 return 0;
36 } 37 }
37 38
38 } // namespace content 39 } // namespace content
OLDNEW
« no previous file with comments | « content/plugin/plugin_main.cc ('k') | content/ppapi_plugin/ppapi_plugin_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698