chrome/browser/ui/webui/chromeos/login/network_state_informer.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/ui/webui/chromeos/login/network_state_informer.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/ui/webui/chromeos/login/network_state_informer.cc

diff --git a/chrome/browser/ui/webui/chromeos/login/network_state_informer.cc b/chrome/browser/ui/webui/chromeos/login/network_state_informer.cc

index 00af2516a81945276e5ec0b653938cad595a4e90..8023002f20927efbfb8ea46d0390bd3b50e6bf4b 100644

--- a/chrome/browser/ui/webui/chromeos/login/network_state_informer.cc

+++ b/chrome/browser/ui/webui/chromeos/login/network_state_informer.cc

@@ -11,10 +11,10 @@

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/chromeos/login/screens/network_error.h"

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

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

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

#include "chromeos/network/network_state.h"

#include "chromeos/network/network_state_handler.h"

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

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

#include "net/proxy/proxy_config.h"

#include "third_party/cros_system_api/dbus/service_constants.h"