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

Side by Side Diff: content/plugin/plugin_main.cc

Issue 17074009: Created multi-process-friendly PowerMonitor interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixing windows unit test errors Created 7 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « content/content_tests.gypi ('k') | content/public/test/browser_test_base.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) 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 #include "build/build_config.h" 5 #include "build/build_config.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #endif 9 #endif
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/message_loop/message_loop.h" 13 #include "base/message_loop/message_loop.h"
14 #include "base/power_monitor/power_monitor.h"
15 #include "base/strings/string_util.h" 14 #include "base/strings/string_util.h"
16 #include "base/threading/platform_thread.h" 15 #include "base/threading/platform_thread.h"
17 #include "base/timer/hi_res_timer_manager.h" 16 #include "base/timer/hi_res_timer_manager.h"
18 #include "content/child/child_process.h" 17 #include "content/child/child_process.h"
19 #include "content/common/content_constants_internal.h" 18 #include "content/common/content_constants_internal.h"
20 #include "content/plugin/plugin_thread.h" 19 #include "content/plugin/plugin_thread.h"
21 #include "content/public/common/content_switches.h" 20 #include "content/public/common/content_switches.h"
22 #include "content/public/common/main_function_params.h" 21 #include "content/public/common/main_function_params.h"
23 22
24 #if defined(OS_WIN) 23 #if defined(OS_WIN)
(...skipping 27 matching lines...) Expand all
52 TrimInterposeEnvironment(); 51 TrimInterposeEnvironment();
53 #endif 52 #endif
54 InitializeChromeApplication(); 53 InitializeChromeApplication();
55 #endif 54 #endif
56 base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI); 55 base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI);
57 base::PlatformThread::SetName("CrPluginMain"); 56 base::PlatformThread::SetName("CrPluginMain");
58 base::debug::TraceLog::GetInstance()->SetProcessName("Plugin Process"); 57 base::debug::TraceLog::GetInstance()->SetProcessName("Plugin Process");
59 base::debug::TraceLog::GetInstance()->SetProcessSortIndex( 58 base::debug::TraceLog::GetInstance()->SetProcessSortIndex(
60 kTraceEventPluginProcessSortIndex); 59 kTraceEventPluginProcessSortIndex);
61 60
62 base::PowerMonitor power_monitor;
63 base::HighResolutionTimerManager high_resolution_timer_manager;
64
65 const CommandLine& parsed_command_line = parameters.command_line; 61 const CommandLine& parsed_command_line = parameters.command_line;
66 62
67 #if defined(OS_LINUX) 63 #if defined(OS_LINUX)
68 64
69 #if defined(ARCH_CPU_64_BITS) 65 #if defined(ARCH_CPU_64_BITS)
70 WorkaroundFlashLAHF(); 66 WorkaroundFlashLAHF();
71 #endif 67 #endif
72 68
73 #elif defined(OS_WIN) 69 #elif defined(OS_WIN)
74 base::win::ScopedCOMInitializer com_initializer; 70 base::win::ScopedCOMInitializer com_initializer;
75 #endif 71 #endif
76 72
77 if (parsed_command_line.HasSwitch(switches::kPluginStartupDialog)) { 73 if (parsed_command_line.HasSwitch(switches::kPluginStartupDialog)) {
78 ChildProcess::WaitForDebugger("Plugin"); 74 ChildProcess::WaitForDebugger("Plugin");
79 } 75 }
80 76
81 { 77 {
82 ChildProcess plugin_process; 78 ChildProcess plugin_process;
83 plugin_process.set_main_thread(new PluginThread()); 79 plugin_process.set_main_thread(new PluginThread());
80 base::HighResolutionTimerManager hi_res_timer_manager;
84 base::MessageLoop::current()->Run(); 81 base::MessageLoop::current()->Run();
85 } 82 }
86 83
87 return 0; 84 return 0;
88 } 85 }
89 86
90 } // namespace content 87 } // namespace content
OLDNEW
« no previous file with comments | « content/content_tests.gypi ('k') | content/public/test/browser_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698