cros: Fold UserBoardModel into UserSelectionScreen.

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 16 matching lines @@
   std::string display_type = oobe_ui->display_type();
   user_selection_screen_.reset(new ChromeUserSelectionScreen(display_type));
   user_selection_screen_->SetLoginDisplayDelegate(login_display_delegate);
 
   user_board_view_ = oobe_ui_->GetUserBoardScreenActor()->GetWeakPtr();
   user_selection_screen_->SetView(user_board_view_.get());
   // TODO(jdufault): Bind and Unbind should be controlled by either the
   // Model/View which are then each responsible for automatically unbinding the
   // other associated View/Model instance. Then we can eliminate this exposed
   // WeakPtr logic. See crbug.com/685287.
-  user_board_view_->Bind(*user_selection_screen_);
+  user_board_view_->Bind(user_selection_screen_.get());
 
   registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED,
                  content::NotificationService::AllSources());
   user_manager::UserManager::Get()->AddObserver(this);
 }
 
 SignInScreenController::~SignInScreenController() {
   if (user_board_view_)
     user_board_view_->Unbind();
 
@@ skipping 55 matching lines @@
 
   // 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