chrome/browser/media_gallery/media_galleries_preferences_factory.cc - 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_gallery/media_galleries_preferences_factory.cc

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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/media_gallery/media_galleries_preferences_factory.h ('k') | chrome/browser/metrics/metrics_log_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media_gallery/media_galleries_preferences_factory.cc

diff --git a/chrome/browser/media_gallery/media_galleries_preferences_factory.cc b/chrome/browser/media_gallery/media_galleries_preferences_factory.cc

index 0e7fda3769f14926455c8f8d84a0673e32c8932f..4be56d861f03e436c43a55049b734220fa9c1502 100644

--- a/chrome/browser/media_gallery/media_galleries_preferences_factory.cc

+++ b/chrome/browser/media_gallery/media_galleries_preferences_factory.cc

@@ -5,6 +5,7 @@

#include "chrome/browser/media_gallery/media_galleries_preferences_factory.h"

#include "chrome/browser/media_gallery/media_galleries_preferences.h"

+#include "chrome/browser/prefs/pref_registry_syncable.h"

#include "chrome/browser/profiles/profile_dependency_manager.h"

// static

@@ -32,8 +33,8 @@ ProfileKeyedService* MediaGalleriesPreferencesFactory::BuildServiceInstanceFor(

}

void MediaGalleriesPreferencesFactory::RegisterUserPrefs(

- PrefServiceSyncable* prefs) {

- chrome::MediaGalleriesPreferences::RegisterUserPrefs(prefs);

+ PrefRegistrySyncable* prefs) {

+ chrome::MediaGalleriesPreferences::RegisterUserPrefs(prefs);

}

bool MediaGalleriesPreferencesFactory::ServiceRedirectedInIncognito() const {