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

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: Revert using Singleton pattern for PowerMonitor 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 BrowserOnlineStateObserver; 12 class BrowserOnlineStateObserver;
13 class CommandLine; 13 class CommandLine;
14 class HighResolutionTimerManager; 14 class HighResolutionTimerManager;
15 class MessageLoop; 15 class MessageLoop;
16 class SystemMessageWindowWin; 16 class SystemMessageWindowWin;
17 17
18 namespace base { 18 namespace base {
19 class PowerMonitor;
19 class SystemMonitor; 20 class SystemMonitor;
20 } 21 }
21 22
22 namespace media { 23 namespace media {
23 class AudioManager; 24 class AudioManager;
24 } 25 }
25 26
26 namespace media_stream { 27 namespace media_stream {
27 class MediaStreamManager; 28 class MediaStreamManager;
28 } 29 }
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 void MainMessageLoopRun(); 93 void MainMessageLoopRun();
93 94
94 // Members initialized on construction --------------------------------------- 95 // Members initialized on construction ---------------------------------------
95 const content::MainFunctionParams& parameters_; 96 const content::MainFunctionParams& parameters_;
96 const CommandLine& parsed_command_line_; 97 const CommandLine& parsed_command_line_;
97 int result_code_; 98 int result_code_;
98 99
99 // Members initialized in |MainMessageLoopStart()| --------------------------- 100 // Members initialized in |MainMessageLoopStart()| ---------------------------
100 scoped_ptr<MessageLoop> main_message_loop_; 101 scoped_ptr<MessageLoop> main_message_loop_;
101 scoped_ptr<base::SystemMonitor> system_monitor_; 102 scoped_ptr<base::SystemMonitor> system_monitor_;
103 scoped_ptr<base::PowerMonitor> power_monitor_;
102 scoped_ptr<HighResolutionTimerManager> hi_res_timer_manager_; 104 scoped_ptr<HighResolutionTimerManager> hi_res_timer_manager_;
103 scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_; 105 scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_;
104 scoped_ptr<media::AudioManager> audio_manager_; 106 scoped_ptr<media::AudioManager> audio_manager_;
105 scoped_ptr<media_stream::MediaStreamManager> media_stream_manager_; 107 scoped_ptr<media_stream::MediaStreamManager> media_stream_manager_;
106 // Per-process listener for online state changes. 108 // Per-process listener for online state changes.
107 scoped_ptr<BrowserOnlineStateObserver> online_state_observer_; 109 scoped_ptr<BrowserOnlineStateObserver> online_state_observer_;
108 #if defined(OS_WIN) 110 #if defined(OS_WIN)
109 scoped_ptr<SystemMessageWindowWin> system_message_window_; 111 scoped_ptr<SystemMessageWindowWin> system_message_window_;
110 #elif defined(OS_LINUX) 112 #elif defined(OS_LINUX)
111 scoped_ptr<DeviceMonitorLinux> device_monitor_linux_; 113 scoped_ptr<DeviceMonitorLinux> device_monitor_linux_;
(...skipping 23 matching lines...) Expand all
135 scoped_ptr<BrowserProcessSubThread> process_launcher_thread_; 137 scoped_ptr<BrowserProcessSubThread> process_launcher_thread_;
136 scoped_ptr<BrowserProcessSubThread> cache_thread_; 138 scoped_ptr<BrowserProcessSubThread> cache_thread_;
137 scoped_ptr<BrowserProcessSubThread> io_thread_; 139 scoped_ptr<BrowserProcessSubThread> io_thread_;
138 140
139 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop); 141 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop);
140 }; 142 };
141 143
142 } // namespace content 144 } // namespace content
143 145
144 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ 146 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698