chromeos: Replace user image notifications with observer

chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.cc

 // Copyright 2014 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/chromeos/login/users/avatar/user_image_sync_observer.h"
 
 #include "base/bind.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/screens/user_image_screen.h"
 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"
@@ skipping 27 matching lines @@
 
 }  // anonymous namespace
 
 UserImageSyncObserver::Observer::~Observer() {}
 
 UserImageSyncObserver::UserImageSyncObserver(const user_manager::User* user)
     : user_(user),
       prefs_(NULL),
       is_synced_(false),
       local_image_changed_(false) {
+  user_manager::UserManager::Get()->AddObserver(this);
+
   notification_registrar_.reset(new content::NotificationRegistrar);
-  notification_registrar_->Add(this,
-      chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED,
-      content::NotificationService::AllSources());
   if (Profile* profile = ProfileHelper::Get()->GetProfileByUser(user)) {
     OnProfileGained(profile);
   } else {
     notification_registrar_->Add(this,
         chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
         content::NotificationService::AllSources());
   }
 }
 
 UserImageSyncObserver::~UserImageSyncObserver() {
   if (!is_synced_ && prefs_)
     prefs_->RemoveObserver(this);
   if (pref_change_registrar_)
     pref_change_registrar_->RemoveAll();
+
+  user_manager::UserManager::Get()->RemoveObserver(this);
 }
 
 // static
 void UserImageSyncObserver::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry_) {
   registry_->RegisterDictionaryPref(
       kUserImageInfo,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
 }
 
@@ skipping 41 matching lines @@
     OnInitialSync();
   } else if (CanUpdateLocalImageNow()) {
     UpdateLocalImageFromSynced();
   }
 }
 
 void UserImageSyncObserver::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
-  if (type == chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED) {
-    if (Profile* profile = ProfileHelper::Get()->GetProfileByUser(user_)) {
-      notification_registrar_->Remove(
-          this,
-          chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
-          content::NotificationService::AllSources());
-      OnProfileGained(profile);
-    }
-  } else if (type == chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED) {
-    if (is_synced_)
-      UpdateSyncedImageFromLocal();
-    else
-      local_image_changed_ = true;
-  } else {
-    NOTREACHED();
+  DCHECK_EQ(chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, type);
+
+  if (Profile* profile = ProfileHelper::Get()->GetProfileByUser(user_)) {
+    notification_registrar_->Remove(
+        this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
+        content::NotificationService::AllSources());
+    OnProfileGained(profile);
   }
 }
 
+void UserImageSyncObserver::OnUserImageChanged(const user_manager::User& user) {
+  if (is_synced_)
+    UpdateSyncedImageFromLocal();
+  else
+    local_image_changed_ = true;
+}
+
 void UserImageSyncObserver::OnIsSyncingChanged() {
   is_synced_ = prefs_->IsPrioritySyncing();
   if (is_synced_) {
     prefs_->RemoveObserver(this);
     OnInitialSync();
   }
 }
 
 void UserImageSyncObserver::UpdateSyncedImageFromLocal() {
   int local_index = user_->image_index();
@@ skipping 37 matching lines @@
     UserImageScreen* screen = UserImageScreen::Get(wizard_controller);
     if (wizard_controller->current_screen() == screen) {
       if (screen->user_selected_image())
         return false;
     }
   }
   return true;
 }
 
 }  // namespace chromeos