From c003ae7dfe1655e257fa1d607550d982e2e9b23f Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Date: Tue, 13 Oct 2015 16:59:32 +0200
Subject: Adapting to Chromium 47
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Updating to Chromium 47 and adapting API.

Change-Id: Id465bbcd4facd7c47cb8a9f4bd4e18cbdc0d1120
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
---
 src/core/media_capture_devices_dispatcher.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/core/media_capture_devices_dispatcher.h')

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,
-- 
cgit v1.2.3