Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(253)

Unified Diff: chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc

Issue 256223003: Supervised users import: make sure users are up-to-date. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes Created 6 years, 8 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
Index: chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc
diff --git a/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc b/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc
index dc03b063b5f6179aea108b7572f8d53cb83fddeb..7d2e317621dba6395e217229347d06cbc7e0fceb 100644
--- a/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc
+++ b/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc
@@ -89,6 +89,7 @@ LocallyManagedUserCreationScreen::LocallyManagedUserCreationScreen(
actor_(actor),
on_error_screen_(false),
last_page_(kNameOfIntroScreen),
+ sync_service_(NULL),
image_decoder_(NULL),
apply_photo_after_decoding_(false),
selected_image_(0) {
@@ -99,6 +100,8 @@ LocallyManagedUserCreationScreen::LocallyManagedUserCreationScreen(
LocallyManagedUserCreationScreen::~LocallyManagedUserCreationScreen() {
CameraPresenceNotifier::GetInstance()->RemoveObserver(this);
+ if (sync_service_)
+ sync_service_->RemoveObserver(this);
if (actor_)
actor_->SetDelegate(NULL);
if (image_decoder_.get())
@@ -332,6 +335,7 @@ void LocallyManagedUserCreationScreen::OnManagerLoginFailure() {
void LocallyManagedUserCreationScreen::OnManagerFullyAuthenticated(
Profile* manager_profile) {
+ LOG(ERROR) << "-----------------------------OnManagerFullyAuthenticated";
DCHECK(controller_.get());
// For manager user, move desktop to locked container so that windows created
// during the user image picker step are below it.
@@ -343,11 +347,17 @@ void LocallyManagedUserCreationScreen::OnManagerFullyAuthenticated(
actor_->ShowUsernamePage();
last_page_ = kNameOfNewUserParametersScreen;
+ CHECK(!sync_service_);
+ sync_service_ = ManagedUserSyncServiceFactory::GetForProfile(manager_profile);
+ sync_service_->AddObserver(this);
+ OnManagedUsersChanged();
+}
- ManagedUserSyncServiceFactory::GetForProfile(manager_profile)->
- GetManagedUsersAsync(base::Bind(
- &LocallyManagedUserCreationScreen::OnGetManagedUsers,
- weak_factory_.GetWeakPtr()));
+void LocallyManagedUserCreationScreen::OnManagedUsersChanged() {
+ CHECK(sync_service_);
+ sync_service_->GetManagedUsersAsync(
+ base::Bind(&LocallyManagedUserCreationScreen::OnGetManagedUsers,
+ weak_factory_.GetWeakPtr()));
}
void LocallyManagedUserCreationScreen::OnManagerCryptohomeAuthenticated() {

Powered by Google App Engine
This is Rietveld 408576698