diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-13 16:59:32 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-27 14:58:43 +0000 |
| commit | c003ae7dfe1655e257fa1d607550d982e2e9b23f (patch) | |
| tree | d24defce427885c2592c92b65c517f62e23e4325 /src/core/media_capture_devices_dispatcher.h | |
| parent | dffe673c3044a6351aa72b69a5bf60429259c08c (diff) | |
Adapting to Chromium 47
Updating to Chromium 47 and adapting API.
Change-Id: Id465bbcd4facd7c47cb8a9f4bd4e18cbdc0d1120
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'src/core/media_capture_devices_dispatcher.h')
| -rw-r--r-- | src/core/media_capture_devices_dispatcher.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/media_capture_devices_dispatcher.h b/src/core/media_capture_devices_dispatcher.h index 500fe7644..0e51ebe6f 100644 --- a/src/core/media_capture_devices_dispatcher.h +++ b/src/core/media_capture_devices_dispatcher.h @@ -84,7 +84,7 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver, DesktopStreamsRegistry *getDesktopStreamsRegistry(); private: - friend struct DefaultSingletonTraits<MediaCaptureDevicesDispatcher>; + friend struct base::DefaultSingletonTraits<MediaCaptureDevicesDispatcher>; struct PendingAccessRequest { PendingAccessRequest(const content::MediaStreamRequest &request, |