Chromium Code Reviews| 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..b5d4e17c6da17f25012aa4c540d1c752cea0e900 100644 |
| --- a/chrome/browser/chromeos/login/screens/device_disabled_screen.cc |
| +++ b/chrome/browser/chromeos/login/screens/device_disabled_screen.cc |
| @@ -48,11 +48,12 @@ void DeviceDisabledScreen::Show() { |
| if (!actor_ || showing_) |
| return; |
| - bool is_device_disabled = false; |
| + std::string restore_mode; |
| g_browser_process->local_state()->GetDictionary( |
| - prefs::kServerBackedDeviceState)->GetBoolean(policy::kDeviceStateDisabled, |
| - &is_device_disabled); |
| - if (!is_device_disabled || |
| + prefs::kServerBackedDeviceState)->GetString( |
| + policy::kDeviceStateRestoreMode, |
| + &restore_mode); |
| + if (restore_mode != policy::kDeviceStateRestoreModeDisabled || |
|
Mattias Nissler (ping if slow)
2014/10/29 17:41:35
Hm, now that this is getting checked in more and m
bartfab (slow)
2014/10/30 14:10:32
Done.
|
| CommandLine::ForCurrentProcess()->HasSwitch( |
| switches::kDisableDeviceDisabling)) { |
| // Skip the screen if the device is not marked as disabled or device |