chrome/browser/net/pref_proxy_config_tracker_impl.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/net/pref_proxy_config_tracker_impl.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:

Index: chrome/browser/net/pref_proxy_config_tracker_impl.cc

diff --git a/chrome/browser/net/pref_proxy_config_tracker_impl.cc b/chrome/browser/net/pref_proxy_config_tracker_impl.cc

index ccc12ba3a8d761db08516ae9353eb7e7cb215d29..4c48a32489fe55f504eb5d9f91f6f8b3b7f37c30 100644

--- a/chrome/browser/net/pref_proxy_config_tracker_impl.cc

+++ b/chrome/browser/net/pref_proxy_config_tracker_impl.cc

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

#include "base/bind.h"

#include "base/values.h"

#include "chrome/browser/prefs/pref_registry_simple.h"

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

#include "chrome/browser/prefs/pref_service.h"

#include "chrome/browser/prefs/proxy_config_dictionary.h"

#include "chrome/common/chrome_notification_types.h"

@@ -203,11 +204,11 @@ void PrefProxyConfigTrackerImpl::RegisterPrefs(PrefRegistrySimple* registry) {

// static

void PrefProxyConfigTrackerImpl::RegisterUserPrefs(

- PrefServiceSyncable* pref_service) {

+ PrefRegistrySyncable* pref_service) {

DictionaryValue* default_settings = ProxyConfigDictionary::CreateSystem();

pref_service->RegisterDictionaryPref(prefs::kProxy,

default_settings,

- PrefServiceSyncable::UNSYNCABLE_PREF);

+ PrefRegistrySyncable::UNSYNCABLE_PREF);

}

ProxyPrefs::ConfigState PrefProxyConfigTrackerImpl::GetProxyConfig(