Add RESTORE_MODE_DISABLED to RestoreMode

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/screens/device_disabled_screen.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 30 matching lines @@
     actor_->SetDelegate(nullptr);
 }
 
 void DeviceDisabledScreen::PrepareToShow() {
 }
 
 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 more places, maybe it's a good
idea to make this easier by introducing a GetRestoreMode function in
server_backed_device_state.h which returns the mode as an enum value?

[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
     // disabling has been turned off by flag.
     IndicateDeviceNotDisabled();
     return;
   }
 
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
@@ skipping 38 matching lines @@
 void DeviceDisabledScreen::OnActorDestroyed(DeviceDisabledScreenActor* actor) {
   if (actor_ == actor)
     actor_ = nullptr;
 }
 
 void DeviceDisabledScreen::IndicateDeviceNotDisabled() {
   get_base_screen_delegate()->OnExit(BaseScreenDelegate::DEVICE_NOT_DISABLED);
 }
 
 }  // namespace chromeos