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"

[Mattias Nissler (ping if slow), 2012/02/15 15:32:03]

We shouldn't depend on the proto file here. I feel this is a layering violation,
as the locking the devices should be possible without knowing about all the rest
of the enterprise stuff. Can you declare an enum here to represent the mode?
Then, we should also use that in the data store and translate immediately when
we get it from the registration response.

[pastarmovj, 2012/02/15 17:40:14]

Done.

 
 namespace chromeos {
 class CryptohomeLibrary;
 }
 
 namespace policy {
 
+extern const char kEnterpiseDeviceMode[];
+extern const char kKioskDeviceMode[];
+
 // 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,
   };
 
   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(
+      const std::string& user,
+      enterprise_management::DeviceRegisterResponse_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/15 15:32:03]

Maybe bool GetMode(DeviceMode* mode) would be a better API? Or alternatively, if
you declare the enum here, you could add a constant for consumer devices that
you return if the device is not enterprise.

[pastarmovj, 2012/02/15 17:40:14]

Using the local enum I can have a UNKNOWN_DEVICE value to represent not
initialized or unknown mode as well as END_USER_DEVICE mode.

+  enterprise_management::DeviceRegisterResponse_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_;
+  enterprise_management::DeviceRegisterResponse_DeviceMode registration_mode_;
 
   DISALLOW_COPY_AND_ASSIGN(EnterpriseInstallAttributes);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_ENTERPRISE_INSTALL_ATTRIBUTES_H_