Add support for kiosk mode on the client. Make sure the settings are written in the lockbox.

chrome/browser/policy/enterprise_install_attributes.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_POLICY_ENTERPRISE_INSTALL_ATTRIBUTES_H_
 #define CHROME_BROWSER_POLICY_ENTERPRISE_INSTALL_ATTRIBUTES_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "chrome/browser/policy/proto/device_management_backend.pb.h"
 
 namespace chromeos {
 class CryptohomeLibrary;
 }
 
 namespace policy {
 
 // Brokers access to the enterprise-related installation-time attributes on
 // ChromeOS.
 class EnterpriseInstallAttributes {
  public:
   // Return codes for LockDevice().
   enum LockResult {
     LOCK_SUCCESS,
     LOCK_NOT_READY,
     LOCK_BACKEND_ERROR,
     LOCK_WRONG_USER,
   };
 

[Mattias Nissler (ping if slow), 2012/02/16 10:36:27]

comment

[pastarmovj, 2012/02/17 13:59:47]

Done.

+  enum DeviceMode {
+    END_USER_DEVICE,

[Mattias Nissler (ping if slow), 2012/02/16 10:36:27]

Put a common prefix, e.g. DEVICE_MODE_ENTERPRISE etc.

[Mattias Nissler (ping if slow), 2012/02/16 10:36:27]

s/END_USER/CONSUMER/, since enterprise users are also end users :)

[pastarmovj, 2012/02/17 13:59:47]

Done.

[pastarmovj, 2012/02/17 13:59:47]

Done.

+    ENTERPRISE_DEVICE,
+    KIOSK_DEVICE,
+    UNKNOWN_DEVICE
+  };
+
   explicit EnterpriseInstallAttributes(chromeos::CryptohomeLibrary* cryptohome);
 
   // Locks the device to be an enterprise device registered by the given user.
   // This can also be called after the lock has already been taken, in which
   // case it checks that the passed user agrees with the locked attribute.
-  LockResult LockDevice(const std::string& user) WARN_UNUSED_RESULT;
+  LockResult LockDevice(

[Mattias Nissler (ping if slow), 2012/02/16 10:36:27]

this line break should no longer be necessary

[pastarmovj, 2012/02/17 13:59:47]

Done.

+      const std::string& user,
+      DeviceMode device_mode,
+      const std::string& device_id) WARN_UNUSED_RESULT;
 
   // Checks whether this is an enterprise device.
   bool IsEnterpriseDevice();
 
   // Gets the domain this device belongs to or an empty string if the device is
   // not an enterprise device.
   std::string GetDomain();
 
   // Gets the user that registered the device. Returns an empty string if the
   // device is not an enterprise device.
   std::string GetRegistrationUser();
 
+  // Gets the device id that was generated when the device was registered.
+  // Returns an empty string if the device is not an enterprise device or the
+  // device id was not stored in the lockbox (prior to R19).
+  std::string GetDeviceId();
+
+  // Gets the mode the device was enrolled to. The return value only makes sense
+  // for enrolled devices. Always verify with |IsEnrolledDevice| before trusting
+  // the output of this function!

[Mattias Nissler (ping if slow), 2012/02/16 10:36:27]

This comment is outdated, you may want to change it to indicate that this may
return UNKNOWN_DEVICE if the device is non-enterprise

[pastarmovj, 2012/02/17 13:59:47]

Done. Actually for non-enterprise devices it will correctly return
DEVICE_TYPE_CONSUMER. DEVICE_TYPE_UNKNOWN means the device has not been locked
yet.

+  DeviceMode GetMode();
+
  private:
   // Makes sure the local caches for enterprise-related install attributes are
   // up-to-date with what cryptohome has.
   void ReadImmutableAttributes();
 
   chromeos::CryptohomeLibrary* cryptohome_;
 
   bool device_locked_;
   std::string registration_user_;
+  std::string registration_domain_;
+  std::string registration_device_id_;
+  DeviceMode registration_mode_;
 
   DISALLOW_COPY_AND_ASSIGN(EnterpriseInstallAttributes);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_ENTERPRISE_INSTALL_ATTRIBUTES_H_