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

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

Issue 2442313003: Move some proxy config code out of src/chrome (Closed)
Patch Set: Fix DEPS Created 4 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
« no previous file with comments | « chrome/browser/chromeos/ui_proxy_config_service.cc ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/net/proxy_service_factory.cc
diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/proxy_service_factory.cc
index e40109b070d0e47fda980c6b3c8bbb1fead1ca3e..e00888dbe64ec90541466288d71fe2fd098601f5 100644
--- a/chrome/browser/net/proxy_service_factory.cc
+++ b/chrome/browser/net/proxy_service_factory.cc
@@ -28,8 +28,8 @@
#include "net/url_request/url_request_context.h"
#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/proxy_config_service_impl.h"
#include "chromeos/network/dhcp_proxy_script_fetcher_chromeos.h"
+#include "chromeos/network/proxy/proxy_config_service_impl.h"
#endif // defined(OS_CHROMEOS)
#if !defined(OS_ANDROID)
@@ -88,7 +88,9 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
PrefService* profile_prefs,
PrefService* local_state_prefs) {
#if defined(OS_CHROMEOS)
- return new chromeos::ProxyConfigServiceImpl(profile_prefs, local_state_prefs);
+ return new chromeos::ProxyConfigServiceImpl(
+ profile_prefs, local_state_prefs,
+ BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
#else
return new PrefProxyConfigTrackerImpl(
profile_prefs, BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
@@ -100,7 +102,9 @@ PrefProxyConfigTracker*
ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
PrefService* local_state_prefs) {
#if defined(OS_CHROMEOS)
- return new chromeos::ProxyConfigServiceImpl(NULL, local_state_prefs);
+ return new chromeos::ProxyConfigServiceImpl(
+ nullptr, local_state_prefs,
+ BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
#else
return new PrefProxyConfigTrackerImpl(
local_state_prefs,
« no previous file with comments | « chrome/browser/chromeos/ui_proxy_config_service.cc ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698