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

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

Issue 2763383002: Switching AudioInputDeviceManager from using AudioManager interface to AudioSystem one. (Closed)
Patch Set: rebase 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
« no previous file with comments | « no previous file | content/browser/renderer_host/media/audio_input_device_manager.h » ('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 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 std::unique_ptr<base::Thread> indexed_db_thread_; 286 std::unique_ptr<base::Thread> indexed_db_thread_;
287 std::unique_ptr<ServiceManagerContext> service_manager_context_; 287 std::unique_ptr<ServiceManagerContext> service_manager_context_;
288 std::unique_ptr<mojo::edk::ScopedIPCSupport> mojo_ipc_support_; 288 std::unique_ptr<mojo::edk::ScopedIPCSupport> mojo_ipc_support_;
289 289
290 // |user_input_monitor_| has to outlive |audio_manager_|, so declared first. 290 // |user_input_monitor_| has to outlive |audio_manager_|, so declared first.
291 std::unique_ptr<media::UserInputMonitor> user_input_monitor_; 291 std::unique_ptr<media::UserInputMonitor> user_input_monitor_;
292 // AudioThread needs to outlive |audio_manager_|. 292 // AudioThread needs to outlive |audio_manager_|.
293 std::unique_ptr<AudioManagerThread> audio_thread_; 293 std::unique_ptr<AudioManagerThread> audio_thread_;
294 media::ScopedAudioManagerPtr audio_manager_; 294 media::ScopedAudioManagerPtr audio_manager_;
295 // Calls to |audio_system_| must not be posted to the audio thread if it 295 // Calls to |audio_system_| must not be posted to the audio thread if it
296 // differs from the UI one. 296 // differs from the UI one. See http://crbug.com/705455.
297 std::unique_ptr<media::AudioSystem> audio_system_; 297 std::unique_ptr<media::AudioSystem> audio_system_;
298 298
299 std::unique_ptr<midi::MidiService> midi_service_; 299 std::unique_ptr<midi::MidiService> midi_service_;
300 300
301 #if defined(OS_WIN) 301 #if defined(OS_WIN)
302 std::unique_ptr<media::SystemMessageWindowWin> system_message_window_; 302 std::unique_ptr<media::SystemMessageWindowWin> system_message_window_;
303 #elif defined(OS_LINUX) && defined(USE_UDEV) 303 #elif defined(OS_LINUX) && defined(USE_UDEV)
304 std::unique_ptr<media::DeviceMonitorLinux> device_monitor_linux_; 304 std::unique_ptr<media::DeviceMonitorLinux> device_monitor_linux_;
305 #elif defined(OS_MACOSX) && !defined(OS_IOS) 305 #elif defined(OS_MACOSX) && !defined(OS_IOS)
306 std::unique_ptr<media::DeviceMonitorMac> device_monitor_mac_; 306 std::unique_ptr<media::DeviceMonitorMac> device_monitor_mac_;
(...skipping 13 matching lines...) Expand all
320 memory_instrumentation_coordinator_; 320 memory_instrumentation_coordinator_;
321 321
322 // DO NOT add members here. Add them to the right categories above. 322 // DO NOT add members here. Add them to the right categories above.
323 323
324 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop); 324 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop);
325 }; 325 };
326 326
327 } // namespace content 327 } // namespace content
328 328
329 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ 329 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/media/audio_input_device_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698