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

Unified Diff: chrome/browser/chromeos/login/enrollment/auto_enrollment_check_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/enrollment/auto_enrollment_check_screen.cc
diff --git a/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.cc b/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.cc
index 62c399566bb7bc41c33cb1e45caa9e00628b73ff..9f7e45d3c70ddbf1c2746fac4671140c1cd7d548 100644
--- a/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.cc
+++ b/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.cc
@@ -46,24 +46,24 @@ AutoEnrollmentCheckScreen* AutoEnrollmentCheckScreen::Get(
AutoEnrollmentCheckScreen::AutoEnrollmentCheckScreen(
BaseScreenDelegate* base_screen_delegate,
- AutoEnrollmentCheckScreenActor* actor)
+ AutoEnrollmentCheckScreenView* view)
: BaseScreen(base_screen_delegate,
OobeScreen::SCREEN_AUTO_ENROLLMENT_CHECK),
- actor_(actor),
+ view_(view),
auto_enrollment_controller_(nullptr),
captive_portal_status_(
NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN),
auto_enrollment_state_(policy::AUTO_ENROLLMENT_STATE_IDLE),
histogram_helper_(new ErrorScreensHistogramHelper("Enrollment")),
weak_ptr_factory_(this) {
- if (actor_)
- actor_->SetDelegate(this);
+ if (view_)
+ view_->SetDelegate(this);
}
AutoEnrollmentCheckScreen::~AutoEnrollmentCheckScreen() {
network_portal_detector::GetInstance()->RemoveObserver(this);
- if (actor_)
- actor_->SetDelegate(NULL);
+ if (view_)
+ view_->SetDelegate(NULL);
}
void AutoEnrollmentCheckScreen::ClearState() {
@@ -90,7 +90,7 @@ void AutoEnrollmentCheckScreen::Show() {
// Bring up the screen. It's important to do this before updating the UI,
// because the latter may switch to the error screen, which needs to stay on
// top.
- actor_->Show();
+ view_->Show();
histogram_helper_->OnScreenShow();
// Set up state change observers.
@@ -121,10 +121,10 @@ void AutoEnrollmentCheckScreen::Show() {
void AutoEnrollmentCheckScreen::Hide() {
}
-void AutoEnrollmentCheckScreen::OnActorDestroyed(
- AutoEnrollmentCheckScreenActor* actor) {
- if (actor_ == actor)
- actor_ = NULL;
+void AutoEnrollmentCheckScreen::OnViewDestroyed(
+ AutoEnrollmentCheckScreenView* view) {
+ if (view_ == view)
+ view_ = nullptr;
}
void AutoEnrollmentCheckScreen::OnPortalDetectionCompleted(

Powered by Google App Engine
This is Rietveld 408576698