chrome/browser/chromeos/proxy_config_service_impl.cc - Issue 13454006: Moving ManagedNetworkConfigurationHandler to chromeos/.

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 13454006: Moving ManagedNetworkConfigurationHandler to chromeos/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Cleaned up parsing of NetworkUIData. Created 7 years, 8 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 71155f04731cfaaef133d77586e4349e9eb511f5..afdc6d7154c62fccd11693e889bb89e0cb694215 100644

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

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

@@ -14,7 +14,7 @@

#include "base/string_util.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/chromeos/cros/cros_library.h"

-#include "chrome/browser/chromeos/cros/network_ui_data.h"

+#include "chrome/browser/chromeos/cros/network_property_ui_data.h"

#include "chrome/browser/chromeos/login/user_manager.h"

#include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"

#include "chrome/browser/chromeos/settings/cros_settings.h"

@@ -26,6 +26,7 @@

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/pref_names.h"

+#include "chromeos/network/network_ui_data.h"

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

#include "components/user_prefs/pref_registry_syncable.h"

#include "content/public/browser/notification_service.h"