cros: Cleanup lock screen and OOBE C++ backing code.

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"
 #include "chrome/browser/chromeos/login/ui/views/user_board_view.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 
 namespace chromeos {
 
 SignInScreenController* SignInScreenController::instance_ = nullptr;
 
 SignInScreenController::SignInScreenController(
     OobeUI* oobe_ui,
     LoginDisplay::Delegate* login_display_delegate)
     : oobe_ui_(oobe_ui), gaia_screen_(new GaiaScreen()) {
   DCHECK(!instance_);
   instance_ = this;
 
   gaia_screen_->SetScreenHandler(oobe_ui_->GetGaiaScreenActor());
-  std::string display_type = static_cast<OobeUI*>(oobe_ui)->display_type();
+  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());
 }
 
 SignInScreenController::~SignInScreenController() {
   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()->delegate()->OnLockWebUIReady();
-  }
+  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);
 }
 
@@ skipping 29 matching lines @@
     return;
   }
   if (type == chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED) {
     user_selection_screen_->OnUserImageChanged(
         *content::Details<user_manager::User>(details).ptr());
     return;
   }
 }
 
 }  // namespace chromeos