Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(868)

Unified Diff: chrome/browser/chromeos/login/signin_screen_controller.cc

Issue 2429033003: cros: Cleanup lock screen and OOBE C++ backing code. (Closed)
Patch Set: Address comments Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/signin_screen_controller.cc
diff --git a/chrome/browser/chromeos/login/signin_screen_controller.cc b/chrome/browser/chromeos/login/signin_screen_controller.cc
index 2ecc0ae983d7570c485203a8aa917211d456c283..9e62ba38258b0dff379f5310bce50e9761f872df 100644
--- a/chrome/browser/chromeos/login/signin_screen_controller.cc
+++ b/chrome/browser/chromeos/login/signin_screen_controller.cc
@@ -6,6 +6,7 @@
#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"
@@ -23,7 +24,7 @@ SignInScreenController::SignInScreenController(
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);
@@ -51,9 +52,8 @@ void SignInScreenController::Init(const user_manager::UserList& users,
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) {
« no previous file with comments | « chrome/browser/chromeos/login/proxy_auth_dialog_browsertest.cc ('k') | chrome/browser/chromeos/login/ui/lock_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698