Index: chrome/browser/ui/webui/chromeos/login/device_disabled_screen_handler.cc |
diff --git a/chrome/browser/ui/webui/chromeos/login/device_disabled_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/device_disabled_screen_handler.cc |
index 6211c4fd4b25e6235e42229c94b403cd6e642d15..5e6ef053e7f29b0682e082cc771f0a796d266403 100644 |
--- a/chrome/browser/ui/webui/chromeos/login/device_disabled_screen_handler.cc |
+++ b/chrome/browser/ui/webui/chromeos/login/device_disabled_screen_handler.cc |
@@ -27,7 +27,10 @@ DeviceDisabledScreenHandler::~DeviceDisabledScreenHandler() { |
delegate_->OnViewDestroyed(this); |
} |
-void DeviceDisabledScreenHandler::Show() { |
+void DeviceDisabledScreenHandler::Show(OobeScreen oobe_screen) { |
+ if (oobe_screen != kScreenId) |
+ return; |
+ |
if (!page_is_ready()) { |
show_on_init_ = true; |
return; |
@@ -35,12 +38,15 @@ void DeviceDisabledScreenHandler::Show() { |
if (delegate_) { |
CallJS("setEnrollmentDomain", delegate_->GetEnrollmentDomain()); |
- CallJS("setMessage", delegate_->GetMessage()); |
+ CallJS("setMessage", delegate_->GetDeviceDisabledMessage()); |
} |
ShowScreen(kScreenId); |
} |
-void DeviceDisabledScreenHandler::Hide() { |
+void DeviceDisabledScreenHandler::Hide(OobeScreen oobe_screen) { |
+ if (oobe_screen != kScreenId) |
+ return; |
+ |
show_on_init_ = false; |
} |
@@ -50,7 +56,8 @@ void DeviceDisabledScreenHandler::SetDelegate(Delegate* delegate) { |
Initialize(); |
} |
-void DeviceDisabledScreenHandler::UpdateMessage(const std::string& message) { |
+void DeviceDisabledScreenHandler::UpdateDeviceDisabledMessage( |
+ const std::string& message) { |
if (page_is_ready()) |
CallJS("setMessage", message); |
} |
@@ -69,7 +76,7 @@ void DeviceDisabledScreenHandler::Initialize() { |
return; |
if (show_on_init_) { |
- Show(); |
+ Show(kScreenId); |
show_on_init_ = false; |
} |
} |