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 8b3141c737bbc001bdf713951d9e01b4a9789530..d89d7e6c5cbf5429859c813485b7fc330c6670b3 100644 |
--- a/chrome/browser/chromeos/login/screens/device_disabled_screen.cc |
+++ b/chrome/browser/chromeos/login/screens/device_disabled_screen.cc |
@@ -48,11 +48,7 @@ void DeviceDisabledScreen::Show() { |
if (!actor_ || showing_) |
return; |
- bool is_device_disabled = false; |
- g_browser_process->local_state()->GetDictionary( |
- prefs::kServerBackedDeviceState)->GetBoolean(policy::kDeviceStateDisabled, |
- &is_device_disabled); |
- if (!is_device_disabled || |
+ if (policy::GetRestoreMode() != policy::RESTORE_MODE_DISABLED || |
Denis Kuznetsov (DE-MUC)
2014/10/30 22:18:06
Do we need to check for trusted mode here?
bartfab (slow)
2014/11/03 13:32:50
Device disabling can be triggered by two different
|
CommandLine::ForCurrentProcess()->HasSwitch( |
switches::kDisableDeviceDisabling)) { |
// Skip the screen if the device is not marked as disabled or device |