chrome/browser/chromeos/proxy_config_service_impl.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/chromeos/proxy_config_service_impl.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:

Index: chrome/browser/chromeos/proxy_config_service_impl.cc

diff --git a/chrome/browser/chromeos/proxy_config_service_impl.cc b/chrome/browser/chromeos/proxy_config_service_impl.cc

index 8b59c5d3872c05245466d2f82a228a8e3bcd14dc..598244af7457ed309e9c3fb9b9d0c3c44e32374d 100644

--- a/chrome/browser/chromeos/proxy_config_service_impl.cc

+++ b/chrome/browser/chromeos/proxy_config_service_impl.cc

@@ -14,8 +14,6 @@

#include "chrome/browser/browser_process.h"

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

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

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

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

#include "chrome/common/pref_names.h"

#include "chromeos/network/network_profile.h"

#include "chromeos/network/network_profile_handler.h"

@@ -23,6 +21,8 @@

#include "chromeos/network/network_state_handler.h"

#include "chromeos/network/onc/onc_utils.h"

#include "components/policy/core/common/cloud/cloud_policy_constants.h"

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

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

#include "components/user_manager/user_manager.h"

namespace chromeos {