chrome/browser/prefs/browser_prefs.cc - Issue 2442313003: Move some proxy config code out of src/chrome

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 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:

Index: chrome/browser/prefs/browser_prefs.cc

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

index 274044408ffc202269be12dd2a4396b412851933..acdebba4b630c4b0e6b91019498828183bff5334 100644

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

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

@@ -185,7 +185,6 @@

#include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h"

#include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"

#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"

-#include "chrome/browser/chromeos/net/proxy_config_handler.h"

#include "chrome/browser/chromeos/platform_keys/key_permissions.h"

#include "chrome/browser/chromeos/policy/auto_enrollment_client.h"

#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"

@@ -211,6 +210,7 @@

#include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h"

#include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"

#include "chromeos/audio/audio_devices_pref_handler_impl.h"

+#include "chromeos/network/proxy/proxy_config_handler.h"

#include "chromeos/timezone/timezone_resolver.h"

#include "components/invalidation/impl/invalidator_storage.h"

#include "components/onc/onc_pref_names.h"