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

Unified Diff: chrome/browser/net/proxy_service_factory.h

Issue 8102019: redesign and reimplement proxy config service and tracker, revise proxy ui on cros (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 1 month 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/net/proxy_service_factory.h
===================================================================
--- chrome/browser/net/proxy_service_factory.h (revision 108608)
+++ chrome/browser/net/proxy_service_factory.h (working copy)
@@ -8,9 +8,17 @@
#include "base/basictypes.h"
+class ChromeProxyConfigService;
class CommandLine;
-class PrefProxyConfigTracker;
+class PrefProxyConfigTrackerImpl;
+class PrefService;
+#if defined(OS_CHROMEOS)
+namespace chromeos {
+class ProxyConfigServiceImpl;
+}
+#endif // defined(OS_CHROMEOS)
+
namespace net {
class NetLog;
class ProxyConfigService;
@@ -22,9 +30,16 @@
public:
// Creates a ProxyConfigService that delivers the system preferences
// (or the respective ChromeOS equivalent).
- static net::ProxyConfigService* CreateProxyConfigService(
- PrefProxyConfigTracker* proxy_config_tracker);
+ static ChromeProxyConfigService* CreateProxyConfigService();
+#if defined(OS_CHROMEOS)
+ static chromeos::ProxyConfigServiceImpl* CreatePrefProxyConfigTracker(
+ PrefService* pref_service);
+#else
+ static PrefProxyConfigTrackerImpl* CreatePrefProxyConfigTracker(
+ PrefService* pref_service);
+#endif // defined(OS_CHROMEOS)
+
// Create a proxy service according to the options on command line.
static net::ProxyService* CreateProxyService(
net::NetLog* net_log,

Powered by Google App Engine
This is Rietveld 408576698