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

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

Issue 10905076: Minimal if-def changes for OS_IOS in browser_main_loop.* (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Added newline Created 8 years, 3 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
« 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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 scoped_ptr<HighResolutionTimerManager> hi_res_timer_manager_; 106 scoped_ptr<HighResolutionTimerManager> hi_res_timer_manager_;
107 scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_; 107 scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_;
108 scoped_ptr<media::AudioManager> audio_manager_; 108 scoped_ptr<media::AudioManager> audio_manager_;
109 scoped_ptr<media_stream::MediaStreamManager> media_stream_manager_; 109 scoped_ptr<media_stream::MediaStreamManager> media_stream_manager_;
110 // Per-process listener for online state changes. 110 // Per-process listener for online state changes.
111 scoped_ptr<BrowserOnlineStateObserver> online_state_observer_; 111 scoped_ptr<BrowserOnlineStateObserver> online_state_observer_;
112 #if defined(OS_WIN) 112 #if defined(OS_WIN)
113 scoped_ptr<SystemMessageWindowWin> system_message_window_; 113 scoped_ptr<SystemMessageWindowWin> system_message_window_;
114 #elif defined(OS_LINUX) 114 #elif defined(OS_LINUX)
115 scoped_ptr<DeviceMonitorLinux> device_monitor_linux_; 115 scoped_ptr<DeviceMonitorLinux> device_monitor_linux_;
116 #elif defined(OS_MACOSX) 116 #elif defined(OS_MACOSX) && !defined(OS_IOS)
117 scoped_ptr<DeviceMonitorMac> device_monitor_mac_; 117 scoped_ptr<DeviceMonitorMac> device_monitor_mac_;
118 #endif 118 #endif
119 119
120 // Destroy parts_ before main_message_loop_ (required) and before other 120 // Destroy parts_ before main_message_loop_ (required) and before other
121 // classes constructed in content (but after main_thread_). 121 // classes constructed in content (but after main_thread_).
122 scoped_ptr<BrowserMainParts> parts_; 122 scoped_ptr<BrowserMainParts> parts_;
123 123
124 // Members initialized in |InitializeMainThread()| --------------------------- 124 // Members initialized in |InitializeMainThread()| ---------------------------
125 // This must get destroyed before other threads that are created in parts_. 125 // This must get destroyed before other threads that are created in parts_.
126 scoped_ptr<BrowserThreadImpl> main_thread_; 126 scoped_ptr<BrowserThreadImpl> main_thread_;
127 127
128 // Members initialized in |BrowserThreadsStarted()| -------------------------- 128 // Members initialized in |BrowserThreadsStarted()| --------------------------
129 scoped_ptr<ResourceDispatcherHostImpl> resource_dispatcher_host_; 129 scoped_ptr<ResourceDispatcherHostImpl> resource_dispatcher_host_;
130 scoped_ptr<speech::SpeechRecognitionManagerImpl> speech_recognition_manager_; 130 scoped_ptr<speech::SpeechRecognitionManagerImpl> speech_recognition_manager_;
131 131
132 // Members initialized in |RunMainMessageLoopParts()| ------------------------ 132 // Members initialized in |RunMainMessageLoopParts()| ------------------------
133 scoped_ptr<BrowserProcessSubThread> db_thread_; 133 scoped_ptr<BrowserProcessSubThread> db_thread_;
134 #if !defined(OS_IOS)
134 scoped_ptr<WebKitThread> webkit_thread_; 135 scoped_ptr<WebKitThread> webkit_thread_;
136 #endif
135 scoped_ptr<BrowserProcessSubThread> file_user_blocking_thread_; 137 scoped_ptr<BrowserProcessSubThread> file_user_blocking_thread_;
136 scoped_ptr<BrowserProcessSubThread> file_thread_; 138 scoped_ptr<BrowserProcessSubThread> file_thread_;
137 scoped_ptr<BrowserProcessSubThread> process_launcher_thread_; 139 scoped_ptr<BrowserProcessSubThread> process_launcher_thread_;
138 scoped_ptr<BrowserProcessSubThread> cache_thread_; 140 scoped_ptr<BrowserProcessSubThread> cache_thread_;
139 scoped_ptr<BrowserProcessSubThread> io_thread_; 141 scoped_ptr<BrowserProcessSubThread> io_thread_;
140 142
141 #if defined(OS_WIN) 143 #if defined(OS_WIN)
142 ui::ScopedOleInitializer ole_initializer_; 144 ui::ScopedOleInitializer ole_initializer_;
143 #endif 145 #endif
144 146
145 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop); 147 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop);
146 }; 148 };
147 149
148 } // namespace content 150 } // namespace content
149 151
150 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ 152 #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