chrome/browser/prefs/browser_prefs.cc - Issue 1296663003: Componentize proxy code from chrome/browser/net

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/prefs/browser_prefs.cc

Issue 1296663003: Componentize proxy code from chrome/browser/net (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: updating for win p/f Created 5 years, 4 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:

Index: chrome/browser/prefs/browser_prefs.cc

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc

index f092abcb7fd519db67a2b0b760026eb8362df931..10d0a1c9fc980266a8525250712eef7ebac33092 100644

--- a/chrome/browser/prefs/browser_prefs.cc

+++ b/chrome/browser/prefs/browser_prefs.cc

@@ -37,7 +37,6 @@

#include "chrome/browser/net/net_pref_observer.h"

#include "chrome/browser/net/prediction_options.h"

#include "chrome/browser/net/predictor.h"

-#include "chrome/browser/net/pref_proxy_config_tracker_impl.h"

#include "chrome/browser/net/ssl_config_service_manager.h"

#include "chrome/browser/notifications/extension_welcome_notification.h"

#include "chrome/browser/notifications/message_center_notification_manager.h"

@@ -87,6 +86,7 @@

#include "components/omnibox/browser/zero_suggest_provider.h"

#include "components/password_manager/core/browser/password_manager.h"

#include "components/pref_registry/pref_registry_syncable.h"

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

#include "components/rappor/rappor_service.h"

#include "components/search_engines/template_url_prepopulate_data.h"

#include "components/sync_driver/sync_prefs.h"