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

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

Issue 10959020: SystemMonitor refactoring: move power state monitor into a separate class called PowerMonitor (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Use PowerMonitor instead of SystemMonitor in XXXMain function Created 7 years, 9 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
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/hi_res_timer_manager.h" 13 #include "base/hi_res_timer_manager.h"
14 #include "base/message_loop.h" 14 #include "base/message_loop.h"
15 #include "base/string_util.h" 15 #include "base/string_util.h"
16 #include "base/system_monitor/system_monitor.h" 16 #include "base/power_monitor/power_monitor.h"
17 #include "base/threading/platform_thread.h" 17 #include "base/threading/platform_thread.h"
18 #include "content/common/child_process.h" 18 #include "content/common/child_process.h"
19 #include "content/plugin/plugin_thread.h" 19 #include "content/plugin/plugin_thread.h"
20 #include "content/public/common/content_switches.h" 20 #include "content/public/common/content_switches.h"
21 #include "content/public/common/main_function_params.h" 21 #include "content/public/common/main_function_params.h"
22 22
23 #if defined(OS_WIN) 23 #if defined(OS_WIN)
24 #include "base/win/scoped_com_initializer.h" 24 #include "base/win/scoped_com_initializer.h"
25 #include "content/public/common/injection_test_win.h" 25 #include "content/public/common/injection_test_win.h"
26 #include "sandbox/win/src/sandbox.h" 26 #include "sandbox/win/src/sandbox.h"
(...skipping 21 matching lines...) Expand all
48 // The main thread of the plugin services UI. 48 // The main thread of the plugin services UI.
49 #if defined(OS_MACOSX) 49 #if defined(OS_MACOSX)
50 #if !defined(__LP64__) 50 #if !defined(__LP64__)
51 TrimInterposeEnvironment(); 51 TrimInterposeEnvironment();
52 #endif 52 #endif
53 InitializeChromeApplication(); 53 InitializeChromeApplication();
54 #endif 54 #endif
55 MessageLoop main_message_loop(MessageLoop::TYPE_UI); 55 MessageLoop main_message_loop(MessageLoop::TYPE_UI);
56 base::PlatformThread::SetName("CrPluginMain"); 56 base::PlatformThread::SetName("CrPluginMain");
57 57
58 base::SystemMonitor system_monitor; 58 base::PowerMonitor power_monitor;
59 HighResolutionTimerManager high_resolution_timer_manager; 59 HighResolutionTimerManager high_resolution_timer_manager;
60 60
61 const CommandLine& parsed_command_line = parameters.command_line; 61 const CommandLine& parsed_command_line = parameters.command_line;
62 62
63 #if defined(OS_LINUX) 63 #if defined(OS_LINUX)
64 64
65 #if defined(ARCH_CPU_64_BITS) 65 #if defined(ARCH_CPU_64_BITS)
66 WorkaroundFlashLAHF(); 66 WorkaroundFlashLAHF();
67 #endif 67 #endif
68 68
69 #elif defined(OS_WIN) 69 #elif defined(OS_WIN)
70 base::win::ScopedCOMInitializer com_initializer; 70 base::win::ScopedCOMInitializer com_initializer;
71 #endif 71 #endif
72 72
73 if (parsed_command_line.HasSwitch(switches::kPluginStartupDialog)) { 73 if (parsed_command_line.HasSwitch(switches::kPluginStartupDialog)) {
74 ChildProcess::WaitForDebugger("Plugin"); 74 ChildProcess::WaitForDebugger("Plugin");
75 } 75 }
76 76
77 { 77 {
78 ChildProcess plugin_process; 78 ChildProcess plugin_process;
79 plugin_process.set_main_thread(new PluginThread()); 79 plugin_process.set_main_thread(new PluginThread());
80 MessageLoop::current()->Run(); 80 MessageLoop::current()->Run();
81 } 81 }
82 82
83 return 0; 83 return 0;
84 } 84 }
85 85
86 } // namespace content 86 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698