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

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

Issue 10829073: Add DeviceMonitorLinux in BrowserMainLoop. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: code review Created 8 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 | « no previous file | content/browser/browser_main_loop.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 #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"
(...skipping 26 matching lines...) Expand all
37 37
38 namespace speech { 38 namespace speech {
39 class SpeechRecognitionManagerImpl; 39 class SpeechRecognitionManagerImpl;
40 } 40 }
41 41
42 namespace content { 42 namespace content {
43 43
44 class BrowserMainParts; 44 class BrowserMainParts;
45 class BrowserShutdownImpl; 45 class BrowserShutdownImpl;
46 class BrowserThreadImpl; 46 class BrowserThreadImpl;
47 struct MainFunctionParams;
48 class ResourceDispatcherHostImpl; 47 class ResourceDispatcherHostImpl;
49 class WebKitThread; 48 class WebKitThread;
49 struct MainFunctionParams;
50
51 #if defined(OS_LINUX)
52 class DeviceMonitorLinux;
53 #endif
50 54
51 // Implements the main browser loop stages called from BrowserMainRunner. 55 // Implements the main browser loop stages called from BrowserMainRunner.
52 // See comments in browser_main_parts.h for additional info. 56 // See comments in browser_main_parts.h for additional info.
53 // All functions are to be called only on the UI thread unless otherwise noted. 57 // All functions are to be called only on the UI thread unless otherwise noted.
54 class BrowserMainLoop { 58 class BrowserMainLoop {
55 public: 59 public:
56 explicit BrowserMainLoop(const content::MainFunctionParams& parameters); 60 explicit BrowserMainLoop(const content::MainFunctionParams& parameters);
57 virtual ~BrowserMainLoop(); 61 virtual ~BrowserMainLoop();
58 62
59 void Init(); 63 void Init();
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 scoped_ptr<MessageLoop> main_message_loop_; 102 scoped_ptr<MessageLoop> main_message_loop_;
99 scoped_ptr<base::SystemMonitor> system_monitor_; 103 scoped_ptr<base::SystemMonitor> system_monitor_;
100 scoped_ptr<HighResolutionTimerManager> hi_res_timer_manager_; 104 scoped_ptr<HighResolutionTimerManager> hi_res_timer_manager_;
101 scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_; 105 scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_;
102 scoped_ptr<media::AudioManager> audio_manager_; 106 scoped_ptr<media::AudioManager> audio_manager_;
103 scoped_ptr<media_stream::MediaStreamManager> media_stream_manager_; 107 scoped_ptr<media_stream::MediaStreamManager> media_stream_manager_;
104 // Per-process listener for online state changes. 108 // Per-process listener for online state changes.
105 scoped_ptr<BrowserOnlineStateObserver> online_state_observer_; 109 scoped_ptr<BrowserOnlineStateObserver> online_state_observer_;
106 #if defined(OS_WIN) 110 #if defined(OS_WIN)
107 scoped_ptr<SystemMessageWindowWin> system_message_window_; 111 scoped_ptr<SystemMessageWindowWin> system_message_window_;
112 #elif defined(OS_LINUX)
113 scoped_ptr<DeviceMonitorLinux> device_monitor_linux_;
108 #endif 114 #endif
109 115
110 // Destroy parts_ before main_message_loop_ (required) and before other 116 // Destroy parts_ before main_message_loop_ (required) and before other
111 // classes constructed in content (but after main_thread_). 117 // classes constructed in content (but after main_thread_).
112 scoped_ptr<BrowserMainParts> parts_; 118 scoped_ptr<BrowserMainParts> parts_;
113 119
114 // Members initialized in |InitializeMainThread()| --------------------------- 120 // Members initialized in |InitializeMainThread()| ---------------------------
115 // This must get destroyed before other threads that are created in parts_. 121 // This must get destroyed before other threads that are created in parts_.
116 scoped_ptr<BrowserThreadImpl> main_thread_; 122 scoped_ptr<BrowserThreadImpl> main_thread_;
117 123
(...skipping 13 matching lines...) Expand all
131 #if defined(OS_WIN) 137 #if defined(OS_WIN)
132 ui::ScopedOleInitializer ole_initializer_; 138 ui::ScopedOleInitializer ole_initializer_;
133 #endif 139 #endif
134 140
135 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop); 141 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop);
136 }; 142 };
137 143
138 } // namespace content 144 } // namespace content
139 145
140 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ 146 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/browser_main_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698