chrome/browser/chromeos/net/proxy_config_handler.cc - Issue 1658793002: Update chrome for new prefs location.

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/net/proxy_config_handler.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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/net/proxy_config_handler.cc

diff --git a/chrome/browser/chromeos/net/proxy_config_handler.cc b/chrome/browser/chromeos/net/proxy_config_handler.cc

index 297c0c0488c3136d6c9034b62ca3022921416f90..9f9167f435deaac7f1c7a3285c74cb51f5c66cb8 100644

--- a/chrome/browser/chromeos/net/proxy_config_handler.cc

+++ b/chrome/browser/chromeos/net/proxy_config_handler.cc

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

#include "base/bind.h"

#include "base/json/json_writer.h"

#include "base/logging.h"

-#include "base/prefs/pref_registry_simple.h"

#include "base/values.h"

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

#include "chrome/common/pref_names.h"

@@ -20,6 +19,7 @@

#include "chromeos/network/network_state_handler.h"

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

#include "components/pref_registry/pref_registry_syncable.h"

+#include "components/prefs/pref_registry_simple.h"

#include "components/proxy_config/proxy_config_dictionary.h"

#include "dbus/object_path.h"

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