chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc - Issue 1658793002: Update chrome for new prefs location.

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 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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/spdyproxy/data_reduction_proxy_chrome_io_data.cc ('k') | chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_unittest.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 ff94af10c1db27ac813b0822a5b9370c6775d530..b0085f9d8604ae12b430415db391ec41aa3ac6c3 100644

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

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

@@ -11,8 +11,6 @@

#include "base/memory/ref_counted.h"

#include "base/memory/scoped_ptr.h"

#include "base/metrics/histogram_macros.h"

-#include "base/prefs/pref_service.h"

-#include "base/prefs/scoped_user_pref_update.h"

#include "base/strings/string_util.h"

#include "base/time/time.h"

#include "build/build_config.h"

@@ -28,6 +26,8 @@

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

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

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

+#include "components/prefs/pref_service.h"

+#include "components/prefs/scoped_user_pref_update.h"

#include "components/proxy_config/proxy_config_pref_names.h"

#include "components/proxy_config/proxy_prefs.h"

#include "net/base/host_port_pair.h"