chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc - Issue 1221033002: Add proxy_config component

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc

Issue 1221033002: Add proxy_config component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update copyrights Created 5 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 | « chrome/browser/net/proxy_policy_handler_unittest.cc ('k') | chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc

diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc b/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc

index 1ceb296a2f557693381d53234d9c4b6b8c7e0ef6..a45f5834d6cd8c9d74368da77b7d9220dd52e0da 100644

--- a/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc

+++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc

@@ -15,7 +15,6 @@

#include "base/time/time.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/metrics/chrome_metrics_service_accessor.h"

-#include "chrome/browser/prefs/proxy_prefs.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/common/pref_names.h"

@@ -25,6 +24,7 @@

#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h"

#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h"

#include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"

+#include "components/proxy_config/proxy_prefs.h"

#include "net/base/host_port_pair.h"

#include "net/proxy/proxy_config.h"

#include "net/proxy/proxy_list.h"