Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3192)

Unified Diff: chrome/browser/chromeos/proxy_config_service_impl.h

Issue 14622003: components: Move PrefRegistrySyncable into user_prefs namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 7 years, 8 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
Index: chrome/browser/chromeos/proxy_config_service_impl.h
diff --git a/chrome/browser/chromeos/proxy_config_service_impl.h b/chrome/browser/chromeos/proxy_config_service_impl.h
index 873af939cfba21a5923783a181c90fae8092d59e..730e003bd968005b9da7a81f12f217f4f9cc42e4 100644
--- a/chrome/browser/chromeos/proxy_config_service_impl.h
+++ b/chrome/browser/chromeos/proxy_config_service_impl.h
@@ -15,7 +15,10 @@
#include "chrome/browser/net/pref_proxy_config_tracker_impl.h"
class PrefRegistrySimple;
+
+namespace user_prefs {
class PrefRegistrySyncable;
+}
namespace chromeos {
@@ -33,10 +36,9 @@ namespace chromeos {
// - provides UI with methods to retrieve and modify proxy configuration for
// any remembered network (either currently active or non-active) of current
// user profile
-class ProxyConfigServiceImpl
- : public PrefProxyConfigTrackerImpl,
- public NetworkLibrary::NetworkManagerObserver,
- public NetworkLibrary::NetworkObserver {
+class ProxyConfigServiceImpl : public PrefProxyConfigTrackerImpl,
+ public NetworkLibrary::NetworkManagerObserver,
+ public NetworkLibrary::NetworkObserver {
public:
// ProxyConfigServiceImpl is created in ProxyServiceFactory::
// CreatePrefProxyConfigTrackerImpl via Profile::GetProxyConfigTracker() for
@@ -203,7 +205,7 @@ class ProxyConfigServiceImpl
// Register UseShardProxies preference.
static void RegisterPrefs(PrefRegistrySimple* registry);
- static void RegisterUserPrefs(PrefRegistrySyncable* registry);
+ static void RegisterUserPrefs(user_prefs::PrefRegistrySyncable* registry);
#if defined(UNIT_TEST)
void SetTesting(ProxyConfig* test_config) {
« no previous file with comments | « chrome/browser/chromeos/preferences_unittest.cc ('k') | chrome/browser/chromeos/proxy_config_service_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698