chromeos: Replace user image notifications with observer

chrome/browser/chromeos/login/signin_screen_controller.cc

 // Copyright (c) 2012 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/signin_screen_controller.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
 #include "chrome/browser/chromeos/login/lock/webui_screen_locker.h"
 #include "chrome/browser/chromeos/login/screens/chrome_user_selection_screen.h"
@@ skipping 14 matching lines @@
 
   gaia_screen_->SetScreenHandler(oobe_ui_->GetGaiaScreenActor());
   std::string display_type = oobe_ui->display_type();
   user_selection_screen_.reset(new ChromeUserSelectionScreen(display_type));
   user_selection_screen_->SetLoginDisplayDelegate(login_display_delegate);
 
   UserBoardView* user_board_view = oobe_ui_->GetUserBoardScreenActor();
   user_selection_screen_->SetView(user_board_view);
   user_board_view->Bind(*user_selection_screen_.get());
 
-  registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED,
-                 content::NotificationService::AllSources());
   registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED,
                  content::NotificationService::AllSources());
+  user_manager::UserManager::Get()->AddObserver(this);
 }
 
 SignInScreenController::~SignInScreenController() {
+  user_manager::UserManager::Get()->RemoveObserver(this);
   instance_ = nullptr;
 }
 
 void SignInScreenController::Init(const user_manager::UserList& users,
                                   bool show_guest) {
   // TODO(antrim) : This dependency should be inverted, screen should ask about
   // users.
   user_selection_screen_->Init(users, show_guest);
 }
 
 void SignInScreenController::OnSigninScreenReady() {
   gaia_screen_->MaybePreloadAuthExtension();
   user_selection_screen_->InitEasyUnlock();
   if (ScreenLocker::default_screen_locker())
     ScreenLocker::default_screen_locker()->web_ui()->OnLockWebUIReady();
 }
 
 void SignInScreenController::RemoveUser(const AccountId& account_id) {
   user_manager::UserManager::Get()->RemoveUser(account_id, this);
 }
 
 void SignInScreenController::OnBeforeUserRemoved(const AccountId& account_id) {
   user_selection_screen_->OnBeforeUserRemoved(account_id);
 }
 
 void SignInScreenController::OnUserRemoved(const AccountId& account_id) {
   user_selection_screen_->OnUserRemoved(account_id);
 }
 
+void SignInScreenController::OnUserImageChanged(
+    const user_manager::User& user) {
+  user_selection_screen_->OnUserImageChanged(user);
+}
+
 void SignInScreenController::SendUserList() {
   user_selection_screen_->HandleGetUsers();
 }
 
 void SignInScreenController::CheckUserStatus(const AccountId& account_id) {
   user_selection_screen_->CheckUserStatus(account_id);
 }
 
 void SignInScreenController::SetWebUIHandler(
     LoginDisplayWebUIHandler* webui_handler) {
   webui_handler_ = webui_handler;
   gaia_screen_->SetLegacyHandler(webui_handler_);
   user_selection_screen_->SetHandler(webui_handler_);
 }
 
 void SignInScreenController::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
-  if (type == chrome::NOTIFICATION_SESSION_STARTED) {
-    // Stop listening to any notification once session has started.
-    // Sign in screen objects are marked for deletion with DeleteSoon so
-    // make sure no object would be used after session has started.
-    // http://crbug.com/125276
-    registrar_.RemoveAll();
-    return;
-  }
-  if (type == chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED) {
-    user_selection_screen_->OnUserImageChanged(
-        *content::Details<user_manager::User>(details).ptr());
-    return;
-  }
+  DCHECK_EQ(chrome::NOTIFICATION_SESSION_STARTED, type);
+
+  // Stop listening to any notification once session has started.
+  // Sign in screen objects are marked for deletion with DeleteSoon so
+  // make sure no object would be used after session has started.
+  // http://crbug.com/125276
+  registrar_.RemoveAll();
+  user_manager::UserManager::Get()->RemoveObserver(this);
 }
 
 }  // namespace chromeos