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

Unified Diff: media/audio/mac/audio_manager_mac.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: . 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/audio/mac/audio_low_latency_input_mac_unittest.cc ('k') | media/audio/mac/audio_manager_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/mac/audio_manager_mac.h
diff --git a/media/audio/mac/audio_manager_mac.h b/media/audio/mac/audio_manager_mac.h
index f8c99e80dfb749c01cd689223c955e02fed2b8ab..f5159e956cc44a249af38a698cf4e3399969f6b5 100644
--- a/media/audio/mac/audio_manager_mac.h
+++ b/media/audio/mac/audio_manager_mac.h
@@ -8,7 +8,9 @@
#include <AudioUnit/AudioUnit.h>
#include <CoreAudio/AudioHardware.h>
#include <stddef.h>
+
#include <list>
+#include <memory>
#include <string>
#include "base/compiler_specific.h"
@@ -125,7 +127,7 @@ class MEDIA_EXPORT AudioManagerMac : public AudioManagerBase {
// sample rate has changed, otherwise does nothing.
void HandleDeviceChanges();
- scoped_ptr<AudioDeviceListenerMac> output_device_listener_;
+ std::unique_ptr<AudioDeviceListenerMac> output_device_listener_;
// Track the output sample-rate and the default output device
// so we can intelligently handle device notifications only when necessary.
@@ -136,7 +138,7 @@ class MEDIA_EXPORT AudioManagerMac : public AudioManagerBase {
// should defer Start() calls. Required to workaround an OSX bug. See
// http://crbug.com/160920 for more details.
class AudioPowerObserver;
- scoped_ptr<AudioPowerObserver> power_observer_;
+ std::unique_ptr<AudioPowerObserver> power_observer_;
// Tracks all constructed input and output streams.
// TODO(alokp): We used to track these streams to close before destruction.
« no previous file with comments | « media/audio/mac/audio_low_latency_input_mac_unittest.cc ('k') | media/audio/mac/audio_manager_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698