ChromeOS login webui refactoring : Simplify login methods.

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>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/containers/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.h"
 #include "chrome/browser/chromeos/login/screens/error_screen_actor.h"
+#include "chrome/browser/chromeos/login/signin_specifics.h"
 #include "chrome/browser/chromeos/login/ui/login_display.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/chromeos/net/network_portal_detector.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/signin/screenlock_bridge.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chromeos/ime/ime_keyboard.h"
@@ skipping 62 matching lines @@
                          bool animated,
                          bool show_guest) = 0;
 
  protected:
   virtual ~LoginDisplayWebUIHandler() {}
 };
 
 // An interface for SigninScreenHandler to call WebUILoginDisplay.
 class SigninScreenHandlerDelegate {
  public:
+  // --------------- Password change flow methods.
   // Cancels current password changed flow.
   virtual void CancelPasswordChangedFlow() = 0;
 
-  // Cancels user adding.
-  virtual void CancelUserAdding() = 0;
-
-  // Create a new Google account.
-  virtual void CreateAccount() = 0;
-
-  // Confirms sign up by provided credentials in |user_context|.
-  // Used for new user login via GAIA extension.
-  virtual void CompleteLogin(const UserContext& user_context) = 0;
-
-  // Sign in using username and password specified as a part of |user_context|.
-  // Used for both known and new users.
-  virtual void Login(const UserContext& user_context) = 0;
-
-  // Sign in into a retail mode session.
-  virtual void LoginAsRetailModeUser() = 0;
-
-  // Sign in into guest session.
-  virtual void LoginAsGuest() = 0;
-
-  // Sign in into the public account identified by |username|.
-  virtual void LoginAsPublicAccount(const std::string& username) = 0;
-
   // Decrypt cryptohome using user provided |old_password|
   // and migrate to new password.
   virtual void MigrateUserData(const std::string& old_password) = 0;
 
-  // Load wallpaper for given |username|.
-  virtual void LoadWallpaper(const std::string& username) = 0;
-
-  // Loads the default sign-in wallpaper.
-  virtual void LoadSigninWallpaper() = 0;
-
-  // Notify the delegate when the sign-in UI is finished loading.
-  virtual void OnSigninScreenReady() = 0;
-
-  // Attempts to remove given user.
-  virtual void RemoveUser(const std::string& username) = 0;
-
   // Ignore password change, remove existing cryptohome and
   // force full sync of user data.
   virtual void ResyncUserData() = 0;
 
+  // --------------- Sign in/out methods.
+  // Sign in using username and password specified as a part of |user_context|.
+  // Used for both known and new users.
+  virtual void Login(const UserContext& user_context,
+                     const SigninSpecifics& specifics) = 0;
+
+  // Sign in as guest to create a new Google account.
+  virtual void CreateAccount() = 0;
+
+  // Returns true if sign in is in progress.
+  virtual bool IsSigninInProgress() const = 0;
+
+  // Signs out if the screen is currently locked.
+  virtual void Signout() = 0;
+
+  // --------------- Account creation methods.
+  // Confirms sign up by provided credentials in |user_context|.
+  // Used for new user login via GAIA extension.
+  virtual void CompleteLogin(const UserContext& user_context) = 0;
+
+  // --------------- Account creation methods.

[Nikita (slow), 2014/06/06 14:49:48]

nit: should be updated

[Denis Kuznetsov (DE-MUC), 2014/06/06 15:18:43]

Done.

+  // Notify the delegate when the sign-in UI is finished loading.
+  virtual void OnSigninScreenReady() = 0;
+
   // Shows Enterprise Enrollment screen.
   virtual void ShowEnterpriseEnrollmentScreen() = 0;
 
   // Shows Kiosk Enable screen.
   virtual void ShowKioskEnableScreen() = 0;
 
   // Shows Reset screen.
   virtual void ShowKioskAutolaunchScreen() = 0;
 
   // Show wrong hwid screen.
   virtual void ShowWrongHWIDScreen() = 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;
+
+  // --------------- Account creation methods.

[Nikita (slow), 2014/06/06 14:49:48]

nit: should be updated

[Denis Kuznetsov (DE-MUC), 2014/06/06 15:18:43]

Done.

+  // Cancels user adding.
+  virtual void CancelUserAdding() = 0;
+
+  // Load wallpaper for given |username|.
+  virtual void LoadWallpaper(const std::string& username) = 0;
+
+  // Loads the default sign-in wallpaper.
+  virtual void LoadSigninWallpaper() = 0;
+
+  // Attempts to remove given user.
+  virtual void RemoveUser(const std::string& username) = 0;
+
   // Let the delegate know about the handler it is supposed to be using.
   virtual void SetWebUIHandler(LoginDisplayWebUIHandler* webui_handler) = 0;
 
   // 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;
 
-  // 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(
@@ skipping 273 matching lines @@
   scoped_ptr<AuthenticatedUserEmailRetriever> email_retriever_;
 
   base::WeakPtrFactory<SigninScreenHandler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SigninScreenHandler);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_