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

Side by Side Diff: media/audio/win/audio_manager_win.h

Issue 1911913002: Convert //media/audio from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix cast + windows build Created 4 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 MEDIA_AUDIO_WIN_AUDIO_MANAGER_WIN_H_ 5 #ifndef MEDIA_AUDIO_WIN_AUDIO_MANAGER_WIN_H_
6 #define MEDIA_AUDIO_WIN_AUDIO_MANAGER_WIN_H_ 6 #define MEDIA_AUDIO_WIN_AUDIO_MANAGER_WIN_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 const AudioParameters& params, 85 const AudioParameters& params,
86 const std::string& device_id); 86 const std::string& device_id);
87 87
88 // Helper methods for performing expensive initialization tasks on the audio 88 // Helper methods for performing expensive initialization tasks on the audio
89 // thread instead of on the UI thread which AudioManager is constructed on. 89 // thread instead of on the UI thread which AudioManager is constructed on.
90 void InitializeOnAudioThread(); 90 void InitializeOnAudioThread();
91 91
92 void GetAudioDeviceNamesImpl(bool input, AudioDeviceNames* device_names); 92 void GetAudioDeviceNamesImpl(bool input, AudioDeviceNames* device_names);
93 93
94 // Listen for output device changes. 94 // Listen for output device changes.
95 scoped_ptr<AudioDeviceListenerWin> output_device_listener_; 95 std::unique_ptr<AudioDeviceListenerWin> output_device_listener_;
danakj 2016/04/22 22:47:37 include memory
dcheng 2016/04/22 23:13:21 Done.
96 96
97 DISALLOW_COPY_AND_ASSIGN(AudioManagerWin); 97 DISALLOW_COPY_AND_ASSIGN(AudioManagerWin);
98 }; 98 };
99 99
100 } // namespace media 100 } // namespace media
101 101
102 #endif // MEDIA_AUDIO_WIN_AUDIO_MANAGER_WIN_H_ 102 #endif // MEDIA_AUDIO_WIN_AUDIO_MANAGER_WIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698