Revert 275046 "ChromeOS login webui refactoring: split user sele..."

trunk/src/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h

 // Copyright (c) 2013 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_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 70 matching lines @@
                          const std::string& error_text,
                          const std::string& help_link_text,
                          HelpAppLauncher::HelpTopic help_topic_id) = 0;
   virtual void ShowErrorScreen(LoginDisplay::SigninError error_id) = 0;
   virtual void ShowGaiaPasswordChanged(const std::string& username) = 0;
   virtual void ShowSigninUI(const std::string& email) = 0;
   virtual void ShowPasswordChangedDialog(bool show_password_error) = 0;
   // Show sign-in screen for the given credentials.
   virtual void ShowSigninScreenForCreds(const std::string& username,
                                         const std::string& password) = 0;
-  virtual void LoadUsers(const base::ListValue& users_list,
-                         bool animated,
-                         bool show_guest) = 0;
-
  protected:
   virtual ~LoginDisplayWebUIHandler() {}
 };
 
 // An interface for SigninScreenHandler to call WebUILoginDisplay.
 class SigninScreenHandlerDelegate {
  public:
   // Cancels current password changed flow.
   virtual void CancelPasswordChangedFlow() = 0;
 
@@ skipping 58 matching lines @@
   // Returns users list to be shown.
   virtual const UserList& GetUsers() const = 0;
 
   // Whether login as guest is available.
   virtual bool IsShowGuest() const = 0;
 
   // Weather to show the user pods or only GAIA sign in.
   // Public sessions are always shown.
   virtual bool IsShowUsers() const = 0;
 
+  // Whether new user pod is available.
+  virtual bool IsShowNewUser() const = 0;
+
   // Returns true if sign in is in progress.
   virtual bool IsSigninInProgress() const = 0;
 
   // Whether user sign in has completed.
   virtual bool IsUserSigninCompleted() const = 0;
 
   // Sets the displayed email for the next login attempt. If it succeeds,
   // user's displayed email value will be updated to |email|.
   virtual void SetDisplayEmail(const std::string& email) = 0;
 
   // Signs out if the screen is currently locked.
   virtual void Signout() = 0;
 
   // Login to kiosk mode for app with |app_id|.
   virtual void LoginAsKioskApp(const std::string& app_id,
                                bool diagnostic_mode) = 0;
 
-  // Request to (re)load user list.
-  virtual void HandleGetUsers() = 0;
-
-  // Set authentication type (for easier unlocking).
-  virtual void SetAuthType(
-      const std::string& username,
-      ScreenlockBridge::LockHandler::AuthType auth_type) = 0;
-
-  // Get authentication type (for easier unlocking).
-  virtual ScreenlockBridge::LockHandler::AuthType GetAuthType(
-      const std::string& username) const = 0;
-
  protected:
   virtual ~SigninScreenHandlerDelegate() {}
 };
 
 // A class that handles the WebUI hooks in sign-in screen in OobeDisplay
 // and LoginDisplay.
 class SigninScreenHandler
     : public BaseScreenHandler,
       public LoginDisplayWebUIHandler,
       public content::NotificationObserver,
@@ skipping 76 matching lines @@
   virtual void ShowError(int login_attempts,
                          const std::string& error_text,
                          const std::string& help_link_text,
                          HelpAppLauncher::HelpTopic help_topic_id) OVERRIDE;
   virtual void ShowGaiaPasswordChanged(const std::string& username) OVERRIDE;
   virtual void ShowSigninUI(const std::string& email) OVERRIDE;
   virtual void ShowPasswordChangedDialog(bool show_password_error) OVERRIDE;
   virtual void ShowErrorScreen(LoginDisplay::SigninError error_id) OVERRIDE;
   virtual void ShowSigninScreenForCreds(const std::string& username,
                                         const std::string& password) OVERRIDE;
-  virtual void LoadUsers(const base::ListValue& users_list,
-                         bool animated,
-                         bool show_guest) OVERRIDE;
 
   // ui::EventHandler implementation:
   virtual void OnKeyEvent(ui::KeyEvent* key) OVERRIDE;
 
   // content::NotificationObserver implementation:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // ScreenlockBridge::LockHandler implementation:
@@ skipping 68 matching lines @@
   void HandleLoginUIStateChanged(const std::string& source, bool new_value);
   void HandleUnlockOnLoginSuccess();
   void HandleLoginScreenUpdate();
   void HandleShowLoadingTimeoutError();
   void HandleUpdateOfflineLogin(bool offline_login_active);
   void HandleShowLocallyManagedUserCreationScreen();
   void HandleFocusPod(const std::string& user_id);
   void HandleLaunchKioskApp(const std::string& app_id, bool diagnostic_mode);
   void HandleRetrieveAuthenticatedUserEmail(double attempt_token);
 
+  // Fills |user_dict| with information about |user|.
+  static void FillUserDictionary(
+      User* user,
+      bool is_owner,
+      bool is_signin_to_add,
+      ScreenlockBridge::LockHandler::AuthType auth_type,
+      base::DictionaryValue* user_dict);
+
+  // Sends user list to account picker.
+  void SendUserList(bool animated);
+
   // Kick off cookie / local storage cleanup.
   void StartClearingCookies(const base::Closure& on_clear_callback);
   void OnCookiesCleared(base::Closure on_clear_callback);
 
   // Kick off DNS cache flushing.
   void StartClearingDnsCache();
   void OnDnsCleared();
 
   // Decides whether an auth extension should be pre-loaded. If it should,
   // pre-loads it.
@@ skipping 128 matching lines @@
   // NOTIFICATION_AUTH_CANCELLED.
   bool has_pending_auth_ui_;
 
   scoped_ptr<AutoEnrollmentController::ProgressCallbackList::Subscription>
       auto_enrollment_progress_subscription_;
 
   bool caps_lock_enabled_;
 
   base::Closure kiosk_enable_flow_aborted_callback_for_test_;
 
+  // Map of usernames to their current authentication type. If a user is not
+  // contained in the map, it is using the default authentication type.
+  std::map<std::string, ScreenlockBridge::LockHandler::AuthType>
+      user_auth_type_map_;
+
   // Non-owning ptr.
   // TODO (ygorshenin@): remove this dependency.
   GaiaScreenHandler* gaia_screen_handler_;
 
   // Helper that retrieves the authenticated user's e-mail address.
   scoped_ptr<AuthenticatedUserEmailRetriever> email_retriever_;
 
   DISALLOW_COPY_AND_ASSIGN(SigninScreenHandler);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_