chrome/browser/chromeos/login/users/supervised_user_manager_impl.cc - Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager

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 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: similarity Created 6 years, 4 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

« chrome/browser/chromeos/first_run/first_run.cc ('K') | « chrome/browser/chromeos/login/users/supervised_user_manager_impl.h ('k') | chrome/browser/chromeos/login/users/user_manager.h » ('j') | chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc » ('J')
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 7335a0a69ee668861ba3d45774e375b850184f09..1e4b1c321e5ce887a5113bcf596917d645d9f01d 100644

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

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

@@ -17,7 +17,7 @@

#include "chrome/browser/browser_process.h"

#include "chrome/browser/chromeos/login/supervised/supervised_user_authentication.h"

#include "chrome/browser/chromeos/login/supervised/supervised_user_constants.h"

-#include "chrome/browser/chromeos/login/users/chrome_user_manager.h"

+#include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h"

#include "chrome/browser/chromeos/profiles/profile_helper.h"

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

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

@@ -129,7 +129,8 @@ void SupervisedUserManager::RegisterPrefs(PrefRegistrySimple* registry) {

registry->RegisterDictionaryPref(kSupervisedUserIncompleteKey);

}

-SupervisedUserManagerImpl::SupervisedUserManagerImpl(ChromeUserManager* owner)

+SupervisedUserManagerImpl::SupervisedUserManagerImpl(

+ ChromeUserManagerImpl* owner)

: owner_(owner), cros_settings_(CrosSettings::Get()) {

// SupervisedUserManager instance should be used only on UI thread.

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));