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

Unified Diff: chrome/browser/chromeos/login/screens/device_disabled_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/device_disabled_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/device_disabled_screen.cc b/chrome/browser/chromeos/login/screens/device_disabled_screen.cc
index 5bf41c5e7a8207d6c7237461b15329aadb739346..66d644c1c6fb0bf47631bf5d51a946636647962c 100644
--- a/chrome/browser/chromeos/login/screens/device_disabled_screen.cc
+++ b/chrome/browser/chromeos/login/screens/device_disabled_screen.cc
@@ -15,30 +15,30 @@ namespace chromeos {
DeviceDisabledScreen::DeviceDisabledScreen(
BaseScreenDelegate* base_screen_delegate,
- DeviceDisabledScreenActor* actor)
+ DeviceDisabledScreenView* view)
: BaseScreen(base_screen_delegate, OobeScreen::SCREEN_DEVICE_DISABLED),
- actor_(actor),
+ view_(view),
device_disabling_manager_(
g_browser_process->platform_part()->device_disabling_manager()),
showing_(false) {
- DCHECK(actor_);
- if (actor_)
- actor_->SetDelegate(this);
+ DCHECK(view_);
+ if (view_)
+ view_->SetDelegate(this);
device_disabling_manager_->AddObserver(this);
}
DeviceDisabledScreen::~DeviceDisabledScreen() {
- if (actor_)
- actor_->SetDelegate(nullptr);
+ if (view_)
+ view_->SetDelegate(nullptr);
device_disabling_manager_->RemoveObserver(this);
}
void DeviceDisabledScreen::Show() {
- if (!actor_ || showing_)
+ if (!view_ || showing_)
return;
showing_ = true;
- actor_->Show();
+ view_->Show();
}
void DeviceDisabledScreen::Hide() {
@@ -46,13 +46,13 @@ void DeviceDisabledScreen::Hide() {
return;
showing_ = false;
- if (actor_)
- actor_->Hide();
+ if (view_)
+ view_->Hide();
}
-void DeviceDisabledScreen::OnActorDestroyed(DeviceDisabledScreenActor* actor) {
- if (actor_ == actor)
- actor_ = nullptr;
+void DeviceDisabledScreen::OnViewDestroyed(DeviceDisabledScreenView* view) {
+ if (view_ == view)
+ view_ = nullptr;
}
const std::string& DeviceDisabledScreen::GetEnrollmentDomain() const {
@@ -65,8 +65,8 @@ const std::string& DeviceDisabledScreen::GetMessage() const {
void DeviceDisabledScreen::OnDisabledMessageChanged(
const std::string& disabled_message) {
- if (actor_)
- actor_->UpdateMessage(disabled_message);
+ if (view_)
+ view_->UpdateMessage(disabled_message);
}
} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698