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

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

Issue 2763383002: Switching AudioInputDeviceManager from using AudioManager interface to AudioSystem one. (Closed)
Patch Set: Created 3 years, 9 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
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"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #include "base/timer/timer.h" 13 #include "base/timer/timer.h"
14 #include "build/build_config.h" 14 #include "build/build_config.h"
15 #include "content/browser/browser_process_sub_thread.h" 15 #include "content/browser/browser_process_sub_thread.h"
16 #include "content/public/browser/browser_main_runner.h" 16 #include "content/public/browser/browser_main_runner.h"
17 #include "media/audio/audio_manager.h" 17 #include "media/audio/audio_manager.h"
18 #include "media/audio/audio_system.h"
18 #include "services/resource_coordinator/memory/coordinator/coordinator_impl.h" 19 #include "services/resource_coordinator/memory/coordinator/coordinator_impl.h"
19 20
20 #if defined(USE_AURA) 21 #if defined(USE_AURA)
21 namespace aura { 22 namespace aura {
22 class Env; 23 class Env;
23 } 24 }
24 #endif 25 #endif
25 26
26 namespace base { 27 namespace base {
27 class CommandLine; 28 class CommandLine;
28 class FilePath; 29 class FilePath;
29 class HighResolutionTimerManager; 30 class HighResolutionTimerManager;
30 class MemoryPressureMonitor; 31 class MemoryPressureMonitor;
31 class MessageLoop; 32 class MessageLoop;
32 class PowerMonitor; 33 class PowerMonitor;
33 class SystemMonitor; 34 class SystemMonitor;
34 namespace trace_event { 35 namespace trace_event {
35 class TraceEventSystemStatsMonitor; 36 class TraceEventSystemStatsMonitor;
36 } // namespace trace_event 37 } // namespace trace_event
37 } // namespace base 38 } // namespace base
38 39
39 namespace discardable_memory { 40 namespace discardable_memory {
40 class DiscardableSharedMemoryManager; 41 class DiscardableSharedMemoryManager;
41 } 42 }
42 43
43 namespace media { 44 namespace media {
44 class AudioSystem;
45 #if defined(OS_WIN) 45 #if defined(OS_WIN)
46 class SystemMessageWindowWin; 46 class SystemMessageWindowWin;
47 #elif defined(OS_LINUX) && defined(USE_UDEV) 47 #elif defined(OS_LINUX) && defined(USE_UDEV)
48 class DeviceMonitorLinux; 48 class DeviceMonitorLinux;
49 #endif 49 #endif
50 class UserInputMonitor; 50 class UserInputMonitor;
51 #if defined(OS_MACOSX) 51 #if defined(OS_MACOSX)
52 class DeviceMonitorMac; 52 class DeviceMonitorMac;
53 #endif 53 #endif
54 } // namespace media 54 } // namespace media
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 // Members initialized in |BrowserThreadsStarted()| -------------------------- 291 // Members initialized in |BrowserThreadsStarted()| --------------------------
292 std::unique_ptr<base::Thread> indexed_db_thread_; 292 std::unique_ptr<base::Thread> indexed_db_thread_;
293 std::unique_ptr<ServiceManagerContext> service_manager_context_; 293 std::unique_ptr<ServiceManagerContext> service_manager_context_;
294 std::unique_ptr<mojo::edk::ScopedIPCSupport> mojo_ipc_support_; 294 std::unique_ptr<mojo::edk::ScopedIPCSupport> mojo_ipc_support_;
295 295
296 // |user_input_monitor_| has to outlive |audio_manager_|, so declared first. 296 // |user_input_monitor_| has to outlive |audio_manager_|, so declared first.
297 std::unique_ptr<media::UserInputMonitor> user_input_monitor_; 297 std::unique_ptr<media::UserInputMonitor> user_input_monitor_;
298 // AudioThread needs to outlive |audio_manager_|. 298 // AudioThread needs to outlive |audio_manager_|.
299 std::unique_ptr<AudioManagerThread> audio_thread_; 299 std::unique_ptr<AudioManagerThread> audio_thread_;
300 media::ScopedAudioManagerPtr audio_manager_; 300 media::ScopedAudioManagerPtr audio_manager_;
301 // Calls to |audio_system_| must not be posted to the audio thread if it 301 media::AudioSystem::UniquePtr audio_system_;
302 // differs from the UI one.
303 std::unique_ptr<media::AudioSystem> audio_system_;
304 302
305 std::unique_ptr<midi::MidiService> midi_service_; 303 std::unique_ptr<midi::MidiService> midi_service_;
306 304
307 #if defined(OS_WIN) 305 #if defined(OS_WIN)
308 std::unique_ptr<media::SystemMessageWindowWin> system_message_window_; 306 std::unique_ptr<media::SystemMessageWindowWin> system_message_window_;
309 #elif defined(OS_LINUX) && defined(USE_UDEV) 307 #elif defined(OS_LINUX) && defined(USE_UDEV)
310 std::unique_ptr<media::DeviceMonitorLinux> device_monitor_linux_; 308 std::unique_ptr<media::DeviceMonitorLinux> device_monitor_linux_;
311 #elif defined(OS_MACOSX) && !defined(OS_IOS) 309 #elif defined(OS_MACOSX) && !defined(OS_IOS)
312 std::unique_ptr<media::DeviceMonitorMac> device_monitor_mac_; 310 std::unique_ptr<media::DeviceMonitorMac> device_monitor_mac_;
313 #endif 311 #endif
(...skipping 12 matching lines...) Expand all
326 memory_instrumentation_coordinator_; 324 memory_instrumentation_coordinator_;
327 325
328 // DO NOT add members here. Add them to the right categories above. 326 // DO NOT add members here. Add them to the right categories above.
329 327
330 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop); 328 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop);
331 }; 329 };
332 330
333 } // namespace content 331 } // namespace content
334 332
335 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ 333 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698