chrome/browser/chromeos/login/users/supervised_user_manager_impl.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/login/users/supervised_user_manager_impl.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/chromeos/login/users/multi_profile_user_controller.cc ('k') | chrome/browser/chromeos/login/users/user_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/users/supervised_user_manager_impl.cc

diff --git a/chrome/browser/chromeos/login/users/supervised_user_manager_impl.cc b/chrome/browser/chromeos/login/users/supervised_user_manager_impl.cc

index c54efe2c8fe567210632da9eb4565b836f2046c4..0d19f8acd5dcdc7207507b90dd7657bcd8fbb1e0 100644

--- a/chrome/browser/chromeos/login/users/supervised_user_manager_impl.cc

+++ b/chrome/browser/chromeos/login/users/supervised_user_manager_impl.cc

@@ -6,9 +6,6 @@

#include "base/files/file_path.h"

#include "base/files/file_util.h"

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

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

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

#include "base/strings/string_util.h"

#include "base/strings/stringprintf.h"

#include "base/strings/utf_string_conversions.h"

@@ -23,6 +20,9 @@

#include "chrome/browser/supervised_user/supervised_user_service_factory.h"

#include "chromeos/login/user_names.h"

#include "chromeos/settings/cros_settings_names.h"

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

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

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

#include "components/user_manager/user_type.h"

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

#include "google_apis/gaia/gaia_auth_util.h"