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

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

Issue 2700303002: cros: Unify oobe View/Actor naming to just View. (Closed)
Patch Set: Rebase Created 3 years, 10 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/arc_kiosk_controller.cc
diff --git a/chrome/browser/chromeos/login/arc_kiosk_controller.cc b/chrome/browser/chromeos/login/arc_kiosk_controller.cc
index b895e97c3c94efd232b6ef4237b6b637b612990a..da04f6ec93c2f2ac48b9890755eced753b21c537 100644
--- a/chrome/browser/chromeos/login/arc_kiosk_controller.cc
+++ b/chrome/browser/chromeos/login/arc_kiosk_controller.cc
@@ -26,11 +26,11 @@ constexpr base::TimeDelta kArcKioskSplashScreenMinTime =
ArcKioskController::ArcKioskController(LoginDisplayHost* host, OobeUI* oobe_ui)
: host_(host),
- arc_kiosk_splash_screen_actor_(oobe_ui->GetArcKioskSplashScreenActor()),
+ arc_kiosk_splash_screen_view_(oobe_ui->GetArcKioskSplashScreenView()),
weak_ptr_factory_(this) {}
ArcKioskController::~ArcKioskController() {
- arc_kiosk_splash_screen_actor_->SetDelegate(nullptr);
+ arc_kiosk_splash_screen_view_->SetDelegate(nullptr);
}
void ArcKioskController::StartArcKiosk(const AccountId& account_id) {
@@ -38,8 +38,8 @@ void ArcKioskController::StartArcKiosk(const AccountId& account_id) {
host_->GetWebUILoginView()->SetUIEnabled(true);
- arc_kiosk_splash_screen_actor_->SetDelegate(this);
- arc_kiosk_splash_screen_actor_->Show();
+ arc_kiosk_splash_screen_view_->SetDelegate(this);
+ arc_kiosk_splash_screen_view_->Show();
splash_wait_timer_.Start(FROM_HERE, kArcKioskSplashScreenMinTime,
base::Bind(&ArcKioskController::CloseSplashScreen,
weak_ptr_factory_.GetWeakPtr()));
@@ -107,14 +107,14 @@ void ArcKioskController::OnProfilePrepared(Profile* profile,
// a profile load, so invalidate the delegate now.
UserSessionManager::GetInstance()->DelegateDeleted(this);
ArcKioskAppService::Get(profile_)->SetDelegate(this);
- arc_kiosk_splash_screen_actor_->UpdateArcKioskState(
- ArcKioskSplashScreenActor::ArcKioskState::WAITING_APP_LAUNCH);
+ arc_kiosk_splash_screen_view_->UpdateArcKioskState(
+ ArcKioskSplashScreenView::ArcKioskState::WAITING_APP_LAUNCH);
}
void ArcKioskController::OnAppStarted() {
DVLOG(1) << "ARC Kiosk launch succeeded, wait for app window.";
- arc_kiosk_splash_screen_actor_->UpdateArcKioskState(
- ArcKioskSplashScreenActor::ArcKioskState::WAITING_APP_WINDOW);
+ arc_kiosk_splash_screen_view_->UpdateArcKioskState(
+ ArcKioskSplashScreenView::ArcKioskState::WAITING_APP_WINDOW);
}
void ArcKioskController::OnAppWindowLaunched() {

Powered by Google App Engine
This is Rietveld 408576698