Enable device disabling during normal operation

chrome/browser/chromeos/login/screens/device_disabled_screen.cc

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 e7c5d7ec34657df89767bbc44180a31b72487093..bcd439537364ab559e0815529bdc0ea19a645c85 100644
--- a/chrome/browser/chromeos/login/screens/device_disabled_screen.cc
+++ b/chrome/browser/chromeos/login/screens/device_disabled_screen.cc
@@ -10,7 +10,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
-#include "chrome/browser/chromeos/system/device_disabling_manager.h"
 
 namespace chromeos {
 
@@ -18,16 +17,20 @@ DeviceDisabledScreen::DeviceDisabledScreen(
     BaseScreenDelegate* base_screen_delegate,
     DeviceDisabledScreenActor* actor)
     : BaseScreen(base_screen_delegate),
-      showing_(false),
-      actor_(actor) {
+      actor_(actor),
+      device_disabling_manager_(g_browser_process->platform_part()->
+                                    device_disabling_manager()),
+      showing_(false) {
   DCHECK(actor_);
   if (actor_)
     actor_->SetDelegate(this);
+  device_disabling_manager_->AddObserver(this);
 }
 
 DeviceDisabledScreen::~DeviceDisabledScreen() {
   if (actor_)
     actor_->SetDelegate(nullptr);
+  device_disabling_manager_->RemoveObserver(this);
 }
 
 void DeviceDisabledScreen::PrepareToShow() {
@@ -38,8 +41,7 @@ void DeviceDisabledScreen::Show() {
     return;
 
   showing_ = true;
-  actor_->Show(g_browser_process->platform_part()->device_disabling_manager()->
-                  disabled_message());
+  actor_->Show(device_disabling_manager_->disabled_message());
 }
 
 void DeviceDisabledScreen::Hide() {
@@ -60,4 +62,10 @@ void DeviceDisabledScreen::OnActorDestroyed(DeviceDisabledScreenActor* actor) {
     actor_ = nullptr;
 }
 
+void DeviceDisabledScreen::OnDisabledMessageChanged(
+    const std::string& disabled_message) {
+  if (actor_)
+    actor_->UpdateMessage(disabled_message);
+}
+
 }  // namespace chromeos