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

Side by Side Diff: content/browser/browser_main_loop.h

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: Add PlatformInit/Destory for all platforms Created 8 years, 1 month 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 #ifndef CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ 5 #ifndef CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
6 #define CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ 6 #define CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "content/browser/browser_process_sub_thread.h" 10 #include "content/browser/browser_process_sub_thread.h"
11 11
12 class CommandLine; 12 class CommandLine;
13 class HighResolutionTimerManager; 13 class HighResolutionTimerManager;
14 class MessageLoop; 14 class MessageLoop;
15 15
16 namespace base { 16 namespace base {
17 class PowerMonitor;
17 class SystemMonitor; 18 class SystemMonitor;
18 } 19 }
19 20
20 namespace media { 21 namespace media {
21 class AudioManager; 22 class AudioManager;
22 } 23 }
23 24
24 namespace net { 25 namespace net {
25 class NetworkChangeNotifier; 26 class NetworkChangeNotifier;
26 } 27 }
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 void MainMessageLoopRun(); 86 void MainMessageLoopRun();
86 87
87 // Members initialized on construction --------------------------------------- 88 // Members initialized on construction ---------------------------------------
88 const MainFunctionParams& parameters_; 89 const MainFunctionParams& parameters_;
89 const CommandLine& parsed_command_line_; 90 const CommandLine& parsed_command_line_;
90 int result_code_; 91 int result_code_;
91 92
92 // Members initialized in |MainMessageLoopStart()| --------------------------- 93 // Members initialized in |MainMessageLoopStart()| ---------------------------
93 scoped_ptr<MessageLoop> main_message_loop_; 94 scoped_ptr<MessageLoop> main_message_loop_;
94 scoped_ptr<base::SystemMonitor> system_monitor_; 95 scoped_ptr<base::SystemMonitor> system_monitor_;
96 scoped_ptr<base::PowerMonitor> power_monitor_;
95 scoped_ptr<HighResolutionTimerManager> hi_res_timer_manager_; 97 scoped_ptr<HighResolutionTimerManager> hi_res_timer_manager_;
96 scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_; 98 scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_;
97 scoped_ptr<media::AudioManager> audio_manager_; 99 scoped_ptr<media::AudioManager> audio_manager_;
98 scoped_ptr<MediaStreamManager> media_stream_manager_; 100 scoped_ptr<MediaStreamManager> media_stream_manager_;
99 // Per-process listener for online state changes. 101 // Per-process listener for online state changes.
100 scoped_ptr<BrowserOnlineStateObserver> online_state_observer_; 102 scoped_ptr<BrowserOnlineStateObserver> online_state_observer_;
101 #if defined(OS_WIN) 103 #if defined(OS_WIN)
102 scoped_ptr<SystemMessageWindowWin> system_message_window_; 104 scoped_ptr<SystemMessageWindowWin> system_message_window_;
103 #elif defined(OS_LINUX) 105 #elif defined(OS_LINUX)
104 scoped_ptr<DeviceMonitorLinux> device_monitor_linux_; 106 scoped_ptr<DeviceMonitorLinux> device_monitor_linux_;
(...skipping 23 matching lines...) Expand all
128 scoped_ptr<BrowserProcessSubThread> process_launcher_thread_; 130 scoped_ptr<BrowserProcessSubThread> process_launcher_thread_;
129 scoped_ptr<BrowserProcessSubThread> cache_thread_; 131 scoped_ptr<BrowserProcessSubThread> cache_thread_;
130 scoped_ptr<BrowserProcessSubThread> io_thread_; 132 scoped_ptr<BrowserProcessSubThread> io_thread_;
131 133
132 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop); 134 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop);
133 }; 135 };
134 136
135 } // namespace content 137 } // namespace content
136 138
137 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ 139 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698