chrome/browser/geolocation/chrome_geolocation_permission_context_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/geolocation/chrome_geolocation_permission_context_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/geolocation/chrome_geolocation_permission_context_factory.h ('k') | chrome/browser/geolocation/geolocation_prefs.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/geolocation/chrome_geolocation_permission_context_factory.cc

diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context_factory.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context_factory.cc

index 985ab16112a2eef73672f4f07cbb160d5cf73776..1cab5df44495348f836394bccbe91ef7f27374ac 100644

--- a/chrome/browser/geolocation/chrome_geolocation_permission_context_factory.cc

+++ b/chrome/browser/geolocation/chrome_geolocation_permission_context_factory.cc

@@ -4,6 +4,7 @@

#include "chrome/browser/geolocation/chrome_geolocation_permission_context_factory.h"

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

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

#include "chrome/common/pref_names.h"

#if defined(OS_ANDROID)

@@ -71,11 +72,11 @@ ChromeGeolocationPermissionContextFactory::BuildServiceInstanceFor(

}

void ChromeGeolocationPermissionContextFactory::RegisterUserPrefs(

- PrefServiceSyncable* user_prefs) {

+ PrefRegistrySyncable* registry) {

#if defined(OS_ANDROID)

- user_prefs->RegisterBooleanPref(prefs::kGeolocationEnabled,

- true,

- PrefServiceSyncable::UNSYNCABLE_PREF);

+ registry->RegisterBooleanPref(prefs::kGeolocationEnabled,

+ true,

+ PrefRegistrySyncable::UNSYNCABLE_PREF);

#endif

}