chrome/browser/chromeos/proxy_config_service_impl.cc - Issue 12340111: Introduce //components/user_prefs, use to eliminate c/b/prefs dependency in Autofill.

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 12340111: Introduce //components/user_prefs, use to eliminate c/b/prefs dependency in Autofill. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Pure merge of LKGR Created 7 years, 10 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/preferences.cc ('k') | chrome/browser/content_settings/content_settings_default_provider.cc » ('j') | components/user_prefs/pref_registry_syncable.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 752ebdfbb0a8303a34fd1aa47be1aeb248791b4b..913bbd8eee5c61ff7cc6011fc3c32781e65b5123 100644

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

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

@@ -17,13 +17,13 @@

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

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

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

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

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

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

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

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/pref_names.h"

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

+#include "components/user_prefs/pref_registry_syncable.h"

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

#include "grit/generated_resources.h"

#include "ui/base/l10n/l10n_util.h"