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

Unified Diff: chrome/browser/chromeos/login/screens/arc_terms_of_service_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/arc_terms_of_service_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/arc_terms_of_service_screen.cc b/chrome/browser/chromeos/login/screens/arc_terms_of_service_screen.cc
index 8fbd907a3f50ad570563006c79b44887c4444e80..34b0abf37ce0774e6595b8ceff8a519bcc279deb 100644
--- a/chrome/browser/chromeos/login/screens/arc_terms_of_service_screen.cc
+++ b/chrome/browser/chromeos/login/screens/arc_terms_of_service_screen.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen.h"
-#include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_actor.h"
+#include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_view.h"
#include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
#include "chrome/browser/metrics/metrics_reporting_state.h"
@@ -17,30 +17,30 @@ namespace chromeos {
ArcTermsOfServiceScreen::ArcTermsOfServiceScreen(
BaseScreenDelegate* base_screen_delegate,
- ArcTermsOfServiceScreenActor* actor)
+ ArcTermsOfServiceScreenView* view)
: BaseScreen(base_screen_delegate, OobeScreen::SCREEN_ARC_TERMS_OF_SERVICE),
- actor_(actor) {
- DCHECK(actor_);
- if (actor_)
- actor_->AddObserver(this);
+ view_(view) {
+ DCHECK(view_);
+ if (view_)
+ view_->AddObserver(this);
}
ArcTermsOfServiceScreen::~ArcTermsOfServiceScreen() {
- if (actor_)
- actor_->RemoveObserver(this);
+ if (view_)
+ view_->RemoveObserver(this);
}
void ArcTermsOfServiceScreen::Show() {
- if (!actor_)
+ if (!view_)
return;
// Show the screen.
- actor_->Show();
+ view_->Show();
}
void ArcTermsOfServiceScreen::Hide() {
- if (actor_)
- actor_->Hide();
+ if (view_)
+ view_->Hide();
}
void ArcTermsOfServiceScreen::OnSkip() {
@@ -51,10 +51,10 @@ void ArcTermsOfServiceScreen::OnAccept() {
Finish(BaseScreenDelegate::ARC_TERMS_OF_SERVICE_FINISHED);
}
-void ArcTermsOfServiceScreen::OnActorDestroyed(
- ArcTermsOfServiceScreenActor* actor) {
- DCHECK_EQ(actor, actor_);
- actor_ = nullptr;
+void ArcTermsOfServiceScreen::OnViewDestroyed(
+ ArcTermsOfServiceScreenView* view) {
+ DCHECK_EQ(view, view_);
+ view_ = nullptr;
}
} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698