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

Unified Diff: chrome/browser/io_thread.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/io_thread.h
===================================================================
--- chrome/browser/io_thread.h (revision 106059)
+++ chrome/browser/io_thread.h (working copy)
@@ -28,6 +28,12 @@
class ListValue;
}
+#if defined(OS_CHROMEOS)
+namespace chromeos {
+class ProxyConfigServiceImpl;
+}
+#endif // defined(OS_CHROMEOS)
+
namespace net {
class CertVerifier;
class CookieStore;
@@ -177,7 +183,11 @@
// which gets posted by calling certain member functions of IOThread.
scoped_ptr<net::ProxyConfigService> system_proxy_config_service_;
- scoped_refptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
+#if defined(OS_CHROMEOS)
+ scoped_ptr<chromeos::ProxyConfigServiceImpl> pref_proxy_config_tracker_;
+#else
+ scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
Mattias Nissler (ping if slow) 2011/10/19 17:03:42 You might get away in this case by just using scop
kuan 2011/10/20 00:41:11 Done.
+#endif // defined(OS_CHROMEOS)
scoped_refptr<net::URLRequestContextGetter>
system_url_request_context_getter_;

Powered by Google App Engine
This is Rietveld 408576698