chrome/browser/media/media_capture_devices_dispatcher.h - Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/media/media_capture_devices_dispatcher.h

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head again; base::File changes conflicted. Created 7 years, 10 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:

Index: chrome/browser/media/media_capture_devices_dispatcher.h

diff --git a/chrome/browser/media/media_capture_devices_dispatcher.h b/chrome/browser/media/media_capture_devices_dispatcher.h

index b28bb2f5fa8f59fd77c1ee7f6c1d77d70a0c627e..8c3533199817ae0bd4c2c075e30d759d551176ad 100644

--- a/chrome/browser/media/media_capture_devices_dispatcher.h

+++ b/chrome/browser/media/media_capture_devices_dispatcher.h

@@ -13,7 +13,8 @@

#include "content/public/common/media_stream_request.h"

class MediaStreamCaptureIndicator;

-class PrefServiceSyncable;

+class PrefRegistrySyncable;

+class PrefService;

class Profile;

// This singleton is used to receive updates about media events from the content

@@ -45,7 +46,8 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver {

static MediaCaptureDevicesDispatcher* GetInstance();

// Registers the preferences related to Media Stream default devices.

- static void RegisterUserPrefs(PrefServiceSyncable* user_prefs);

+ static void RegisterUserPrefs(PrefService* user_prefs,

+ PrefRegistrySyncable* registry);

// Methods for observers. Called on UI thread.

// Observers should add themselves on construction and remove themselves