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

Unified Diff: chrome/browser/profiles/profile.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, 2 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/profiles/profile.h
===================================================================
--- chrome/browser/profiles/profile.h (revision 106059)
+++ chrome/browser/profiles/profile.h (working copy)
@@ -25,6 +25,12 @@
class ResetDefaultProxyConfigServiceTask;
}
+#if defined(OS_CHROMEOS)
+namespace chromeos {
+class ProxyConfigServiceImpl;
+}
+#endif // defined(OS_CHROMEOS)
+
namespace fileapi {
class FileSystemContext;
class SandboxedFileSystemContext;
@@ -95,6 +101,12 @@
typedef int LocalProfileId;
#endif
+#if defined(OS_CHROMEOS)
+typedef chromeos::ProxyConfigServiceImpl PrefProxyConfigTrackerType;
+#else
+typedef PrefProxyConfigTracker PrefProxyConfigTrackerType;
+#endif // defined(OS_CHROMEOS)
Mattias Nissler (ping if slow) 2011/10/24 10:18:28 I'm wondering whether we might even want to go a s
kuan 2011/10/25 02:01:54 Done.
+
class Profile : public content::BrowserContext {
public:
// Profile services are accessed with the following parameter. This parameter
@@ -479,7 +491,7 @@
// Returns the helper object that provides the proxy configuration service
// access to the the proxy configuration possibly defined by preferences.
- virtual PrefProxyConfigTracker* GetProxyConfigTracker() = 0;
+ virtual PrefProxyConfigTrackerType* GetProxyConfigTracker() = 0;
// Returns the Predictor object used for dns prefetch.
virtual chrome_browser_net::Predictor* GetNetworkPredictor() = 0;

Powered by Google App Engine
This is Rietveld 408576698