Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / login / managed / managed_user_creation_controller_new.h

diff --git a/src/chrome/browser/chromeos/login/managed/managed_user_creation_controller_new.h b/src/chrome/browser/chromeos/login/managed/managed_user_creation_controller_new.h
index 127b247..df9df6e 100644 (file)
--- a/src/chrome/browser/chromeos/login/managed/managed_user_creation_controller_new.h
+++ b/src/chrome/browser/chromeos/login/managed/managed_user_creation_controller_new.h
@@ -66,20 +66,21 @@ class ManagedUserCreationControllerNew
                            const std::string& master_key) OVERRIDE;
 
   // Configures and initiates importing existing supervised user to this device.
-  // Existing user is identified by |sync_id|, has |display_name|, |password|,
-  // |avatar_index|. The master key for cryptohome is a |master_key|.
-  // The user has password specified in |password_data| and |encryption_key|/
-  // |signature_key| for cryptohome.
+  // Existing user is identified by |sync_id|, has |display_name|,
+  // |avatar_index|. The master key for cryptohome is a |master_key|. The user
+  // has password specified in |password_data| and
+  // |encryption_key|/|signature_key| for cryptohome.
   virtual void StartImport(const base::string16& display_name,
-                           const std::string& password,
                            int avatar_index,
                            const std::string& sync_id,
                            const std::string& master_key,
                            const base::DictionaryValue* password_data,
                            const std::string& encryption_key,
-                           const std::string& signature_key);
+                           const std::string& signature_key) OVERRIDE;
 
   virtual void SetManagerProfile(Profile* manager_profile) OVERRIDE;
+  virtual Profile* GetManagerProfile() OVERRIDE;
+
   virtual void CancelCreation() OVERRIDE;
   virtual void FinishCreation() OVERRIDE;
   virtual std::string GetManagedUserId() OVERRIDE;
@@ -148,6 +149,7 @@ class ManagedUserCreationControllerNew
 
   // Authenticator success callbacks.
   void OnMountSuccess(const std::string& mount_hash);
+  void OnAddKeySuccess();
   void OnPasswordHashingSuccess(const std::string& password_hash);
 
   void StartCreationImpl();