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

Unified Diff: net/proxy/proxy_service.cc

Issue 223143006: Make necessary changes for chromecast build as chromecast has it own implementation of NetworkChang… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove the use of CHROMECAST_BUILD macro. Use feature-based gyp variables and C macros to specify c… Created 6 years, 6 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
« no previous file with comments | « net/net.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_service.cc
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc
index c5cd6ac3354c6630f64426dd938a29d1a00e7ee3..585c2fa0e63a532f982cc997185d4c92c409082c 100644
--- a/net/proxy/proxy_service.cc
+++ b/net/proxy/proxy_service.cc
@@ -1368,7 +1368,9 @@ void ProxyService::ForceReloadProxyConfig() {
ProxyConfigService* ProxyService::CreateSystemProxyConfigService(
base::SingleThreadTaskRunner* io_thread_task_runner,
base::MessageLoop* file_loop) {
-#if defined(OS_WIN)
+#if defined(USE_DIRECT_CONFIG_SERVICE)
+ return new ProxyConfigServiceDirect();
+#elif defined(OS_WIN)
return new ProxyConfigServiceWin();
#elif defined(OS_IOS)
return new ProxyConfigServiceIOS();
« no previous file with comments | « net/net.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698