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

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

Issue 2589493006: Revert of Enable connection to Mojo services from Blink (Closed)
Patch Set: Created 4 years 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 | « content/browser/browser_context.cc ('k') | 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 <memory> 8 #include <memory>
9 9
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 17 matching lines...) Expand all
28 class HighResolutionTimerManager; 28 class HighResolutionTimerManager;
29 class MemoryPressureMonitor; 29 class MemoryPressureMonitor;
30 class MessageLoop; 30 class MessageLoop;
31 class PowerMonitor; 31 class PowerMonitor;
32 class SystemMonitor; 32 class SystemMonitor;
33 namespace trace_event { 33 namespace trace_event {
34 class TraceEventSystemStatsMonitor; 34 class TraceEventSystemStatsMonitor;
35 } // namespace trace_event 35 } // namespace trace_event
36 } // namespace base 36 } // namespace base
37 37
38 namespace device {
39 class TimeZoneMonitor;
40 }
41
38 namespace media { 42 namespace media {
39 #if defined(OS_WIN) 43 #if defined(OS_WIN)
40 class SystemMessageWindowWin; 44 class SystemMessageWindowWin;
41 #elif defined(OS_LINUX) && defined(USE_UDEV) 45 #elif defined(OS_LINUX) && defined(USE_UDEV)
42 class DeviceMonitorLinux; 46 class DeviceMonitorLinux;
43 #endif 47 #endif
44 class UserInputMonitor; 48 class UserInputMonitor;
45 #if defined(OS_MACOSX) 49 #if defined(OS_MACOSX)
46 class DeviceMonitorMac; 50 class DeviceMonitorMac;
47 #endif 51 #endif
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 135
132 int GetResultCode() const { return result_code_; } 136 int GetResultCode() const { return result_code_; }
133 137
134 media::AudioManager* audio_manager() const { return audio_manager_.get(); } 138 media::AudioManager* audio_manager() const { return audio_manager_.get(); }
135 MediaStreamManager* media_stream_manager() const { 139 MediaStreamManager* media_stream_manager() const {
136 return media_stream_manager_.get(); 140 return media_stream_manager_.get();
137 } 141 }
138 media::UserInputMonitor* user_input_monitor() const { 142 media::UserInputMonitor* user_input_monitor() const {
139 return user_input_monitor_.get(); 143 return user_input_monitor_.get();
140 } 144 }
145 device::TimeZoneMonitor* time_zone_monitor() const {
146 return time_zone_monitor_.get();
147 }
141 midi::MidiService* midi_service() const { return midi_service_.get(); } 148 midi::MidiService* midi_service() const { return midi_service_.get(); }
142 base::Thread* indexed_db_thread() const { return indexed_db_thread_.get(); } 149 base::Thread* indexed_db_thread() const { return indexed_db_thread_.get(); }
143 150
144 bool is_tracing_startup_for_duration() const { 151 bool is_tracing_startup_for_duration() const {
145 return is_tracing_startup_for_duration_; 152 return is_tracing_startup_for_duration_;
146 } 153 }
147 154
148 const base::FilePath& startup_trace_file() const { 155 const base::FilePath& startup_trace_file() const {
149 return startup_trace_file_; 156 return startup_trace_file_;
150 } 157 }
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 std::unique_ptr<media::DeviceMonitorMac> device_monitor_mac_; 304 std::unique_ptr<media::DeviceMonitorMac> device_monitor_mac_;
298 #endif 305 #endif
299 #if defined(USE_OZONE) 306 #if defined(USE_OZONE)
300 std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_; 307 std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_;
301 #endif 308 #endif
302 309
303 std::unique_ptr<LoaderDelegateImpl> loader_delegate_; 310 std::unique_ptr<LoaderDelegateImpl> loader_delegate_;
304 std::unique_ptr<ResourceDispatcherHostImpl> resource_dispatcher_host_; 311 std::unique_ptr<ResourceDispatcherHostImpl> resource_dispatcher_host_;
305 std::unique_ptr<MediaStreamManager> media_stream_manager_; 312 std::unique_ptr<MediaStreamManager> media_stream_manager_;
306 std::unique_ptr<SpeechRecognitionManagerImpl> speech_recognition_manager_; 313 std::unique_ptr<SpeechRecognitionManagerImpl> speech_recognition_manager_;
314 std::unique_ptr<device::TimeZoneMonitor> time_zone_monitor_;
307 scoped_refptr<SaveFileManager> save_file_manager_; 315 scoped_refptr<SaveFileManager> save_file_manager_;
308 316
309 // DO NOT add members here. Add them to the right categories above. 317 // DO NOT add members here. Add them to the right categories above.
310 318
311 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop); 319 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop);
312 }; 320 };
313 321
314 } // namespace content 322 } // namespace content
315 323
316 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ 324 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
OLDNEW
« no previous file with comments | « content/browser/browser_context.cc ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698