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

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

Issue 2763383002: Switching AudioInputDeviceManager from using AudioManager interface to AudioSystem one. (Closed)
Patch Set: (fails on Mac in content_unittests) Created 3 years, 8 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"
(...skipping 280 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
302 // differs from the UI one.
303 std::unique_ptr<media::AudioSystem> audio_system_; 301 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_;
(...skipping 13 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