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

Unified Diff: chrome/browser/chromeos/login/screens/device_disabled_screen.cc

Issue 2740953006: cros: WIP patch to remove DeviceDisabledScreenView.
Patch Set: Created 3 years, 9 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 66d644c1c6fb0bf47631bf5d51a946636647962c..085faca8d0421bbe332bf2597f2bbae0cb49c4f0 100644
--- a/chrome/browser/chromeos/login/screens/device_disabled_screen.cc
+++ b/chrome/browser/chromeos/login/screens/device_disabled_screen.cc
@@ -15,7 +15,7 @@ namespace chromeos {
DeviceDisabledScreen::DeviceDisabledScreen(
BaseScreenDelegate* base_screen_delegate,
- DeviceDisabledScreenView* view)
+ CoreOobeView* view)
: BaseScreen(base_screen_delegate, OobeScreen::SCREEN_DEVICE_DISABLED),
view_(view),
device_disabling_manager_(
@@ -38,7 +38,7 @@ void DeviceDisabledScreen::Show() {
return;
showing_ = true;
- view_->Show();
+ view_->Show(kScreenId);
}
void DeviceDisabledScreen::Hide() {
@@ -47,26 +47,26 @@ void DeviceDisabledScreen::Hide() {
showing_ = false;
if (view_)
- view_->Hide();
+ view_->Hide(kScreenId);
}
-void DeviceDisabledScreen::OnViewDestroyed(DeviceDisabledScreenView* view) {
+void DeviceDisabledScreen::OnViewDestroyed(CoreOobeView* view) {
if (view_ == view)
view_ = nullptr;
}
-const std::string& DeviceDisabledScreen::GetEnrollmentDomain() const {
+std::string DeviceDisabledScreen::GetEnrollmentDomain() const {
return device_disabling_manager_->enrollment_domain();
}
-const std::string& DeviceDisabledScreen::GetMessage() const {
+std::string DeviceDisabledScreen::GetDeviceDisabledMessage() const {
return device_disabling_manager_->disabled_message();
}
void DeviceDisabledScreen::OnDisabledMessageChanged(
const std::string& disabled_message) {
if (view_)
- view_->UpdateMessage(disabled_message);
+ view_->UpdateDeviceDisabledMessage(disabled_message);
}
} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698