chrome/browser/supervised_user/supervised_user_whitelist_service.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/supervised_user/supervised_user_whitelist_service.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:

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

Download patch

« no previous file with comments | « chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc ('k') | chrome/browser/supervised_user/supervised_user_whitelist_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/supervised_user/supervised_user_whitelist_service.cc

diff --git a/chrome/browser/supervised_user/supervised_user_whitelist_service.cc b/chrome/browser/supervised_user/supervised_user_whitelist_service.cc

index ed9aeb1f72c323c9e129fa0ea4ad61a66be181a2..84379c9a07f6bbc12f1e46fe28c61751448e20bc 100644

--- a/chrome/browser/supervised_user/supervised_user_whitelist_service.cc

+++ b/chrome/browser/supervised_user/supervised_user_whitelist_service.cc

@@ -13,8 +13,6 @@

#include "base/metrics/histogram.h"

#include "base/metrics/user_metrics.h"

#include "base/metrics/user_metrics_action.h"

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

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

#include "base/strings/string_split.h"

#include "base/values.h"

#include "chrome/browser/component_updater/supervised_user_whitelist_installer.h"

@@ -22,6 +20,8 @@

#include "chrome/common/chrome_switches.h"

#include "chrome/common/pref_names.h"

#include "components/pref_registry/pref_registry_syncable.h"

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

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

#include "sync/api/sync_change.h"

#include "sync/api/sync_data.h"

#include "sync/api/sync_error.h"