diff options
Diffstat (limited to 'chrome/browser/media')
10 files changed, 11 insertions, 10 deletions
diff --git a/chrome/browser/media/media_capture_devices_dispatcher.cc b/chrome/browser/media/media_capture_devices_dispatcher.cc index f4e6c0f..0d876f3 100644 --- a/chrome/browser/media/media_capture_devices_dispatcher.cc +++ b/chrome/browser/media/media_capture_devices_dispatcher.cc @@ -74,7 +74,7 @@ inline DesktopCaptureAccessHandler* ToDesktopCaptureAccessHandler( } // namespace MediaCaptureDevicesDispatcher* MediaCaptureDevicesDispatcher::GetInstance() { - return Singleton<MediaCaptureDevicesDispatcher>::get(); + return base::Singleton<MediaCaptureDevicesDispatcher>::get(); } MediaCaptureDevicesDispatcher::MediaCaptureDevicesDispatcher() diff --git a/chrome/browser/media/media_capture_devices_dispatcher.h b/chrome/browser/media/media_capture_devices_dispatcher.h index e036f60..184510c7 100644 --- a/chrome/browser/media/media_capture_devices_dispatcher.h +++ b/chrome/browser/media/media_capture_devices_dispatcher.h @@ -148,7 +148,7 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver { void SetTestVideoCaptureDevices(const content::MediaStreamDevices& devices); private: - friend struct DefaultSingletonTraits<MediaCaptureDevicesDispatcher>; + friend struct base::DefaultSingletonTraits<MediaCaptureDevicesDispatcher>; MediaCaptureDevicesDispatcher(); ~MediaCaptureDevicesDispatcher() override; diff --git a/chrome/browser/media/media_stream_camera_permission_context_factory.cc b/chrome/browser/media/media_stream_camera_permission_context_factory.cc index af93919..a5afebe 100644 --- a/chrome/browser/media/media_stream_camera_permission_context_factory.cc +++ b/chrome/browser/media/media_stream_camera_permission_context_factory.cc @@ -34,7 +34,7 @@ MediaStreamCameraPermissionContextFactory::GetBrowserContextToUse( // static MediaStreamCameraPermissionContextFactory* MediaStreamCameraPermissionContextFactory::GetInstance() { - return Singleton<MediaStreamCameraPermissionContextFactory>::get(); + return base::Singleton<MediaStreamCameraPermissionContextFactory>::get(); } // static diff --git a/chrome/browser/media/media_stream_camera_permission_context_factory.h b/chrome/browser/media/media_stream_camera_permission_context_factory.h index d881ec4..1c3a1d1 100644 --- a/chrome/browser/media/media_stream_camera_permission_context_factory.h +++ b/chrome/browser/media/media_stream_camera_permission_context_factory.h @@ -19,7 +19,7 @@ class MediaStreamCameraPermissionContextFactory static MediaStreamCameraPermissionContextFactory* GetInstance(); private: - friend struct DefaultSingletonTraits< + friend struct base::DefaultSingletonTraits< MediaStreamCameraPermissionContextFactory>; MediaStreamCameraPermissionContextFactory(); diff --git a/chrome/browser/media/media_stream_mic_permission_context_factory.cc b/chrome/browser/media/media_stream_mic_permission_context_factory.cc index c59d6f0..c078e92 100644 --- a/chrome/browser/media/media_stream_mic_permission_context_factory.cc +++ b/chrome/browser/media/media_stream_mic_permission_context_factory.cc @@ -32,7 +32,7 @@ MediaStreamMicPermissionContextFactory::GetBrowserContextToUse( // static MediaStreamMicPermissionContextFactory* MediaStreamMicPermissionContextFactory::GetInstance() { - return Singleton<MediaStreamMicPermissionContextFactory>::get(); + return base::Singleton<MediaStreamMicPermissionContextFactory>::get(); } // static diff --git a/chrome/browser/media/media_stream_mic_permission_context_factory.h b/chrome/browser/media/media_stream_mic_permission_context_factory.h index a524b30..d00b58e 100644 --- a/chrome/browser/media/media_stream_mic_permission_context_factory.h +++ b/chrome/browser/media/media_stream_mic_permission_context_factory.h @@ -19,7 +19,8 @@ class MediaStreamMicPermissionContextFactory static MediaStreamMicPermissionContextFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<MediaStreamMicPermissionContextFactory>; + friend struct base::DefaultSingletonTraits< + MediaStreamMicPermissionContextFactory>; MediaStreamMicPermissionContextFactory(); ~MediaStreamMicPermissionContextFactory() override; diff --git a/chrome/browser/media/midi_permission_context_factory.cc b/chrome/browser/media/midi_permission_context_factory.cc index 5a3b617..a7bf35c 100644 --- a/chrome/browser/media/midi_permission_context_factory.cc +++ b/chrome/browser/media/midi_permission_context_factory.cc @@ -19,7 +19,7 @@ MidiPermissionContextFactory::GetForProfile(Profile* profile) { // static MidiPermissionContextFactory* MidiPermissionContextFactory::GetInstance() { - return Singleton<MidiPermissionContextFactory>::get(); + return base::Singleton<MidiPermissionContextFactory>::get(); } MidiPermissionContextFactory::MidiPermissionContextFactory() diff --git a/chrome/browser/media/midi_permission_context_factory.h b/chrome/browser/media/midi_permission_context_factory.h index 53edae6..ac5c792 100644 --- a/chrome/browser/media/midi_permission_context_factory.h +++ b/chrome/browser/media/midi_permission_context_factory.h @@ -18,7 +18,7 @@ class MidiPermissionContextFactory static MidiPermissionContextFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<MidiPermissionContextFactory>; + friend struct base::DefaultSingletonTraits<MidiPermissionContextFactory>; MidiPermissionContextFactory(); ~MidiPermissionContextFactory() override; diff --git a/chrome/browser/media/protected_media_identifier_permission_context_factory.cc b/chrome/browser/media/protected_media_identifier_permission_context_factory.cc index e6ace58..3e0ceff 100644 --- a/chrome/browser/media/protected_media_identifier_permission_context_factory.cc +++ b/chrome/browser/media/protected_media_identifier_permission_context_factory.cc @@ -22,7 +22,7 @@ ProtectedMediaIdentifierPermissionContextFactory::GetForProfile( // static ProtectedMediaIdentifierPermissionContextFactory* ProtectedMediaIdentifierPermissionContextFactory::GetInstance() { - return Singleton< + return base::Singleton< ProtectedMediaIdentifierPermissionContextFactory>::get(); } diff --git a/chrome/browser/media/protected_media_identifier_permission_context_factory.h b/chrome/browser/media/protected_media_identifier_permission_context_factory.h index 3a6a48c..5648187 100644 --- a/chrome/browser/media/protected_media_identifier_permission_context_factory.h +++ b/chrome/browser/media/protected_media_identifier_permission_context_factory.h @@ -20,7 +20,7 @@ class ProtectedMediaIdentifierPermissionContextFactory static ProtectedMediaIdentifierPermissionContextFactory* GetInstance(); private: - friend struct DefaultSingletonTraits< + friend struct base::DefaultSingletonTraits< ProtectedMediaIdentifierPermissionContextFactory>; ProtectedMediaIdentifierPermissionContextFactory(); |