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

Side by Side Diff: chrome/browser/net/pref_proxy_config_tracker_impl.h

Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_NET_PREF_PROXY_CONFIG_TRACKER_IMPL_H_ 5 #ifndef CHROME_BROWSER_NET_PREF_PROXY_CONFIG_TRACKER_IMPL_H_
6 #define CHROME_BROWSER_NET_PREF_PROXY_CONFIG_TRACKER_IMPL_H_ 6 #define CHROME_BROWSER_NET_PREF_PROXY_CONFIG_TRACKER_IMPL_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/observer_list.h" 11 #include "base/observer_list.h"
12 #include "base/prefs/public/pref_change_registrar.h" 12 #include "base/prefs/public/pref_change_registrar.h"
13 #include "chrome/browser/prefs/proxy_config_dictionary.h" 13 #include "chrome/browser/prefs/proxy_config_dictionary.h"
14 #include "net/proxy/proxy_config.h" 14 #include "net/proxy/proxy_config.h"
15 #include "net/proxy/proxy_config_service.h" 15 #include "net/proxy/proxy_config_service.h"
16 16
17 class PrefService; 17 class PrefService;
18 class PrefServiceSimple; 18 class PrefRegistrarSimple;
19 class PrefServiceSyncable; 19 class PrefServiceSyncable;
20 20
21 // A net::ProxyConfigService implementation that applies preference proxy 21 // A net::ProxyConfigService implementation that applies preference proxy
22 // settings (pushed from PrefProxyConfigTrackerImpl) as overrides to the proxy 22 // settings (pushed from PrefProxyConfigTrackerImpl) as overrides to the proxy
23 // configuration determined by a baseline delegate ProxyConfigService on 23 // configuration determined by a baseline delegate ProxyConfigService on
24 // non-ChromeOS platforms. ChromeOS has its own implementation of overrides in 24 // non-ChromeOS platforms. ChromeOS has its own implementation of overrides in
25 // chromeos::ProxyConfigServiceImpl. 25 // chromeos::ProxyConfigServiceImpl.
26 class ChromeProxyConfigService 26 class ChromeProxyConfigService
27 : public net::ProxyConfigService, 27 : public net::ProxyConfigService,
28 public net::ProxyConfigService::Observer { 28 public net::ProxyConfigService::Observer {
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 ProxyPrefs::ConfigState* effective_config_state, 113 ProxyPrefs::ConfigState* effective_config_state,
114 net::ProxyConfig* effective_config); 114 net::ProxyConfig* effective_config);
115 115
116 // Converts a ProxyConfigDictionary to net::ProxyConfig representation. 116 // Converts a ProxyConfigDictionary to net::ProxyConfig representation.
117 // Returns true if the data from in the dictionary is valid, false otherwise. 117 // Returns true if the data from in the dictionary is valid, false otherwise.
118 static bool PrefConfigToNetConfig(const ProxyConfigDictionary& proxy_dict, 118 static bool PrefConfigToNetConfig(const ProxyConfigDictionary& proxy_dict,
119 net::ProxyConfig* config); 119 net::ProxyConfig* config);
120 120
121 // Registers the proxy preferences. These are actually registered 121 // Registers the proxy preferences. These are actually registered
122 // the same way in local state and in user prefs. 122 // the same way in local state and in user prefs.
123 static void RegisterPrefs(PrefServiceSimple* local_state); 123 static void RegisterPrefs(PrefRegistrarSimple* local_state);
124 static void RegisterUserPrefs(PrefServiceSyncable* user_prefs); 124 static void RegisterUserPrefs(PrefServiceSyncable* user_prefs);
125 125
126 protected: 126 protected:
127 // Get the proxy configuration currently defined by preferences. 127 // Get the proxy configuration currently defined by preferences.
128 // Status is indicated in the return value. 128 // Status is indicated in the return value.
129 // Writes the configuration to |config| unless the return value is 129 // Writes the configuration to |config| unless the return value is
130 // CONFIG_UNSET, in which case |config| and |config_source| are not touched. 130 // CONFIG_UNSET, in which case |config| and |config_source| are not touched.
131 ProxyPrefs::ConfigState GetProxyConfig(net::ProxyConfig* config); 131 ProxyPrefs::ConfigState GetProxyConfig(net::ProxyConfig* config);
132 132
133 // Called when there's a change in prefs proxy config. 133 // Called when there's a change in prefs proxy config.
(...skipping 21 matching lines...) Expand all
155 155
156 PrefService* pref_service_; 156 PrefService* pref_service_;
157 ChromeProxyConfigService* chrome_proxy_config_service_; // Weak ptr. 157 ChromeProxyConfigService* chrome_proxy_config_service_; // Weak ptr.
158 bool update_pending_; // True if config has not been pushed to network stack. 158 bool update_pending_; // True if config has not been pushed to network stack.
159 PrefChangeRegistrar proxy_prefs_; 159 PrefChangeRegistrar proxy_prefs_;
160 160
161 DISALLOW_COPY_AND_ASSIGN(PrefProxyConfigTrackerImpl); 161 DISALLOW_COPY_AND_ASSIGN(PrefProxyConfigTrackerImpl);
162 }; 162 };
163 163
164 #endif // CHROME_BROWSER_NET_PREF_PROXY_CONFIG_TRACKER_IMPL_H_ 164 #endif // CHROME_BROWSER_NET_PREF_PROXY_CONFIG_TRACKER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698