chrome/browser/chromeos/proxy_config_service_impl.cc - Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

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/chromeos/proxy_config_service_impl.cc

Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix double registration in Chrome Frame test. 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/chromeos/proxy_config_service_impl.h ('k') | chrome/browser/chromeos/proxy_config_service_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/proxy_config_service_impl.cc

diff --git a/chrome/browser/chromeos/proxy_config_service_impl.cc b/chrome/browser/chromeos/proxy_config_service_impl.cc

index 053e4011febd095a03819ac085aa7f1d1d70ccf8..cb375dd5b9ef826860f69c672cdddfca7f4702c8 100644

--- a/chrome/browser/chromeos/proxy_config_service_impl.cc

+++ b/chrome/browser/chromeos/proxy_config_service_impl.cc

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

#include "chrome/browser/chromeos/settings/cros_settings.h"

#include "chrome/browser/chromeos/settings/cros_settings_names.h"

#include "chrome/browser/policy/proto/chrome_device_policy.pb.h"

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

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

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

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

@@ -580,10 +581,10 @@ bool ProxyConfigServiceImpl::ParseProxyConfig(const Network* network,

}

// static

-void ProxyConfigServiceImpl::RegisterPrefs(PrefServiceSimple* pref_service) {

+void ProxyConfigServiceImpl::RegisterPrefs(PrefRegistrySimple* registry) {

// Use shared proxies default to off. GetUseSharedProxies will return the

// correct value based on pre-login and login.

- pref_service->RegisterBooleanPref(prefs::kUseSharedProxies, true);

+ registry->RegisterBooleanPref(prefs::kUseSharedProxies, true);

}

// static