Implemented profile-aware owner key loading.

chrome/browser/chromeos/settings/device_settings_service.h

 // 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_CHROMEOS_SETTINGS_DEVICE_SETTINGS_SERVICE_H_
 #define CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_SERVICE_H_
 
 #include <deque>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/stl_util.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/tpm_token_loader.h"
 #include "components/policy/core/common/cloud/cloud_policy_validator.h"
+#include "crypto/scoped_nss_types.h"
 #include "policy/proto/device_management_backend.pb.h"
 
 namespace crypto {
 class RSAPrivateKey;
 }
 
 namespace enterprise_management {
 class ChromeDeviceSettingsProto;
 }
 
@@ skipping 160 matching lines @@
   // Checks whether we have the private owner key.
   bool HasPrivateOwnerKey();
 
   // Determines whether the current user is the owner. The callback is
   // guaranteed not to be called before it is possible to determine if the
   // current user is the owner (by testing existence of the private owner key).
   void IsCurrentUserOwnerAsync(const IsCurrentUserOwnerCallback& callback);
 
   // Sets the identity of the user that's interacting with the service. This is
   // relevant only for writing settings through SignAndStore().
-  void SetUsername(const std::string& username);
+  void InitOwner(const std::string& username, crypto::ScopedPK11Slot slot);
   const std::string& GetUsername() const;
 
   // Adds an observer.
   void AddObserver(Observer* observer);
   // Removes an observer.
   void RemoveObserver(Observer* observer);
 
   // SessionManagerClient::Observer:
   virtual void OwnerKeySet(bool success) OVERRIDE;
   virtual void PropertyChangeComplete(bool success) OVERRIDE;
@@ skipping 41 matching lines @@
   SessionManagerClient* session_manager_client_;
   scoped_refptr<OwnerKeyUtil> owner_key_util_;
 
   Status store_status_;
 
   std::vector<OwnershipStatusCallback> pending_ownership_status_callbacks_;
   std::vector<IsCurrentUserOwnerCallback>
       pending_is_current_user_owner_callbacks_;
 
   std::string username_;
+  crypto::ScopedPK11Slot slot_;
   scoped_refptr<OwnerKey> owner_key_;
   // Whether TPM token still needs to be initialized.
   bool waiting_for_tpm_token_;
   // Whether TPM token was ready when the current owner key was set.
   // Implies that the current user is owner iff the private owner key is set.
   bool owner_key_loaded_with_tpm_token_;
 
   scoped_ptr<enterprise_management::PolicyData> policy_data_;
   scoped_ptr<enterprise_management::ChromeDeviceSettingsProto> device_settings_;
 
@@ skipping 18 matching lines @@
   ScopedTestDeviceSettingsService();
   ~ScopedTestDeviceSettingsService();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScopedTestDeviceSettingsService);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_SERVICE_H_