Update managed user registration to allow updating the avatar

chrome/browser/managed_mode/managed_user_registration_utility.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/managed_mode/managed_user_registration_utility.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 32 matching lines @@
   ManagedUserRegistrationUtilityImpl(
       PrefService* prefs,
       scoped_ptr<ManagedUserRefreshTokenFetcher> token_fetcher,
       ManagedUserSyncService* service);
 
   virtual ~ManagedUserRegistrationUtilityImpl();
 
   // Registers a new managed user with the server. |managed_user_id| is a new
   // unique ID for the new managed user. If its value is the same as that of
   // of one of the existing managed users, then the same user will be created
-  // on this machine. |info| contains necessary information like the display
-  // name of the  the user. |callback| is called with the result of the
-  // registration. We use the info here and not the profile, because on
-  // Chrome OS the profile of the managed user does not yet exist.
+  // on this machine (and if he has no avatar in sync, his avatar will
+  // be updated). |info| contains necessary information like
+  // the display name of the user and his avatar. |callback| is called
+  // with the result of the registration. We use the info here and not the
+  // profile, because on Chrome OS the profile of the managed user does not
+  // yet exist.
   virtual void Register(const std::string& managed_user_id,
                         const ManagedUserRegistrationInfo& info,
                         const RegistrationCallback& callback) OVERRIDE;
 
   // ManagedUserSyncServiceObserver:
   virtual void OnManagedUserAcknowledged(const std::string& managed_user_id)
       OVERRIDE;
   virtual void OnManagedUsersSyncingStopped() OVERRIDE;
 
  private:
@@ skipping 26 matching lines @@
   PrefService* prefs_;
   scoped_ptr<ManagedUserRefreshTokenFetcher> token_fetcher_;
 
   // A |BrowserContextKeyedService| owned by the custodian profile.
   ManagedUserSyncService* managed_user_sync_service_;
 
   std::string pending_managed_user_id_;
   std::string pending_managed_user_token_;
   bool pending_managed_user_acknowledged_;
   bool is_existing_managed_user_;
+  bool avatar_updated_;
   RegistrationCallback callback_;
 
   DISALLOW_COPY_AND_ASSIGN(ManagedUserRegistrationUtilityImpl);
 };
 
 } // namespace
 
 ManagedUserRegistrationInfo::ManagedUserRegistrationInfo(const string16& name,
                                                          int avatar_index)
     : avatar_index(avatar_index),
@@ skipping 62 matching lines @@
 
 ManagedUserRegistrationUtilityImpl::ManagedUserRegistrationUtilityImpl(
     PrefService* prefs,
     scoped_ptr<ManagedUserRefreshTokenFetcher> token_fetcher,
     ManagedUserSyncService* service)
     : weak_ptr_factory_(this),
       prefs_(prefs),
       token_fetcher_(token_fetcher.Pass()),
       managed_user_sync_service_(service),
       pending_managed_user_acknowledged_(false),
-      is_existing_managed_user_(false) {
+      is_existing_managed_user_(false),
+      avatar_updated_(false) {
   managed_user_sync_service_->AddObserver(this);
 }
 
 ManagedUserRegistrationUtilityImpl::~ManagedUserRegistrationUtilityImpl() {
   managed_user_sync_service_->RemoveObserver(this);
   CancelPendingRegistration();
 }
 
 void ManagedUserRegistrationUtilityImpl::Register(
     const std::string& managed_user_id,
     const ManagedUserRegistrationInfo& info,
     const RegistrationCallback& callback) {
   DCHECK(pending_managed_user_id_.empty());
   callback_ = callback;
   pending_managed_user_id_ = managed_user_id;
 
   const DictionaryValue* dict = prefs_->GetDictionary(prefs::kManagedUsers);
   is_existing_managed_user_ = dict->HasKey(managed_user_id);
   if (!is_existing_managed_user_) {
     managed_user_sync_service_->AddManagedUser(pending_managed_user_id_,
                                                base::UTF16ToUTF8(info.name),
                                                info.master_key,
                                                info.avatar_index);
   } else {
+      avatar_updated_ =

[Bernhard Bauer, 2013/09/13 20:17:24]

Nit: two spaces less.

[ibra, 2013/09/16 08:59:09]

Done.

+          managed_user_sync_service_->UpdateManagedUserAvatarIfNeeded(
+              managed_user_id,
+              info.avatar_index);
+
     // User already exists, don't wait for acknowledgment.
     OnManagedUserAcknowledged(managed_user_id);
   }
 
   browser_sync::DeviceInfo::GetClientName(
       base::Bind(&ManagedUserRegistrationUtilityImpl::FetchToken,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void ManagedUserRegistrationUtilityImpl::CancelPendingRegistration() {
@@ skipping 55 matching lines @@
   pending_managed_user_token_.clear();
   CompleteRegistration(run_callback, error);
 }
 
 void ManagedUserRegistrationUtilityImpl::CompleteRegistration(
     bool run_callback,
     const GoogleServiceAuthError& error) {
   if (callback_.is_null())
     return;
 
-  // We check that the user being registered is not an existing managed
-  // user before deleting it from sync to avoid accidental deletion of
-  // existing managed users by just canceling the registration for example.
-  if (pending_managed_user_token_.empty() && !is_existing_managed_user_) {
+  if (pending_managed_user_token_.empty()) {
     DCHECK(!pending_managed_user_id_.empty());
-    // Remove the pending managed user if we weren't successful.
-    DictionaryPrefUpdate update(prefs_, prefs::kManagedUsers);
-    bool success =
-        update->RemoveWithoutPathExpansion(pending_managed_user_id_, NULL);
-    DCHECK(success);
-    managed_user_sync_service_->DeleteManagedUser(pending_managed_user_id_);
+
+    if (!is_existing_managed_user_) {
+      // Remove the pending managed user if we weren't successful.
+      // However, check that we are not importing a managed user
+      // before deleting it from sync to avoid accidental deletion of
+      // existing managed users by just canceling the registration for example.
+      managed_user_sync_service_->DeleteManagedUser(pending_managed_user_id_);
+    } else if (avatar_updated_) {
+      // Canceling (or failing) a managed user import that did set the avatar
+      // should undo this change.
+      managed_user_sync_service_->ClearManagedUserAvatar(
+          pending_managed_user_id_);
+    }
   }
 
   if (run_callback)
     callback_.Run(error, pending_managed_user_token_);
   callback_.Reset();
 }
 
 } // namespace