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

Unified Diff: chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.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/screens/kiosk_autolaunch_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.cc b/chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.cc
index 2b78f71ad31bc7ff14162f33ce8e614d7baa5db9..52c1f32245ecfb7cac09d35c4de8a15d8566b6ad 100644
--- a/chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.cc
+++ b/chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.cc
@@ -13,22 +13,22 @@ namespace chromeos {
KioskAutolaunchScreen::KioskAutolaunchScreen(
BaseScreenDelegate* base_screen_delegate,
- KioskAutolaunchScreenActor* actor)
+ KioskAutolaunchScreenView* view)
: BaseScreen(base_screen_delegate, OobeScreen::SCREEN_KIOSK_AUTOLAUNCH),
- actor_(actor) {
- DCHECK(actor_);
- if (actor_)
- actor_->SetDelegate(this);
+ view_(view) {
+ DCHECK(view_);
+ if (view_)
+ view_->SetDelegate(this);
}
KioskAutolaunchScreen::~KioskAutolaunchScreen() {
- if (actor_)
- actor_->SetDelegate(NULL);
+ if (view_)
+ view_->SetDelegate(NULL);
}
void KioskAutolaunchScreen::Show() {
- if (actor_)
- actor_->Show();
+ if (view_)
+ view_->Show();
}
void KioskAutolaunchScreen::OnExit(bool confirmed) {
@@ -36,10 +36,9 @@ void KioskAutolaunchScreen::OnExit(bool confirmed) {
: BaseScreenDelegate::KIOSK_AUTOLAUNCH_CANCELED);
}
-void KioskAutolaunchScreen::OnActorDestroyed(
- KioskAutolaunchScreenActor* actor) {
- if (actor_ == actor)
- actor_ = NULL;
+void KioskAutolaunchScreen::OnViewDestroyed(KioskAutolaunchScreenView* view) {
+ if (view_ == view)
+ view_ = NULL;
}
} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698