ChromeOS login webui refactoring : Simplify login methods.

chrome/browser/chromeos/login/ui/login_display.h

Index: chrome/browser/chromeos/login/ui/login_display.h
diff --git a/chrome/browser/chromeos/login/ui/login_display.h b/chrome/browser/chromeos/login/ui/login_display.h
index 000bda7d002cf9eaeafdd645323701523fef1435..f879a74ab8fc4bf1ed7acb80dfcac4ed2d23d260 100644
--- a/chrome/browser/chromeos/login/ui/login_display.h
+++ b/chrome/browser/chromeos/login/ui/login_display.h
@@ -11,6 +11,7 @@
 #include "base/callback.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/chromeos/login/help_app_launcher.h"
+#include "chrome/browser/chromeos/login/signin_specifics.h"
 #include "chrome/browser/chromeos/login/users/remove_user_delegate.h"
 #include "chrome/browser/chromeos/login/users/user.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
@@ -38,46 +39,48 @@ class LoginDisplay : public RemoveUserDelegate {
     // Cancels current password changed flow.
     virtual void CancelPasswordChangedFlow() = 0;
 
-    // Create new Google account.
-    virtual void CreateAccount() = 0;
-
-    // Complete sign process with specified |user_context|.
-    // Used for new users authenticated through an extension.
-    virtual void CompleteLogin(const UserContext& user_context) = 0;
-
-    // Returns name of the currently connected network.
-    virtual base::string16 GetConnectedNetworkName() = 0;
+    // Ignore password change, remove existing cryptohome and

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

Are you planning to leave this (LoginDisplay) interface or not?

If you planning to leave it, makes sense to sort methods in
webui_login_display.h

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

It will live in some way, but it's most likely to be split to 1-2-3 separate
interfaces.
I will do another pass to ensure ordering of the methods after that.

+    // force full sync of user data.
+    virtual void ResyncUserData() = 0;
 
-    // Returns true if sign in is in progress.
-    virtual bool IsSigninInProgress() const = 0;
+    // Decrypt cryptohome using user provided |old_password|
+    // and migrate to new password.
+    virtual void MigrateUserData(const std::string& old_password) = 0;
 
     // Sign in using |username| and |password| specified.
     // Used for known users only.
-    virtual void Login(const UserContext& user_context) = 0;
+    virtual void Login(const UserContext& user_context,
+                       const SigninSpecifics& specifics) = 0;
 
     // Sign in as a retail mode user.

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

nit: Remove commented code.

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

Done.

-    virtual void LoginAsRetailModeUser() = 0;
+    //    virtual void LoginAsRetailModeUser() = 0;
 
     // Sign in into guest session.
-    virtual void LoginAsGuest() = 0;
-
-    // Decrypt cryptohome using user provided |old_password|
-    // and migrate to new password.
-    virtual void MigrateUserData(const std::string& old_password) = 0;
+    //    virtual void LoginAsGuest() = 0;
 
     // Sign in into the public account identified by |username|.
-    virtual void LoginAsPublicAccount(const std::string& username) = 0;
+    //    virtual void LoginAsPublicAccount(const std::string& username) = 0;
 
     // Login to kiosk mode for app with |app_id|.
     virtual void LoginAsKioskApp(const std::string& app_id,
                                  bool diagnostic_mode) = 0;
 
-    // Notify the delegate when the sign-in UI is finished loading.
-    virtual void OnSigninScreenReady() = 0;
+    // Returns true if sign in is in progress.
+    virtual bool IsSigninInProgress() const = 0;
 
-    // Called when existing user pod is selected in the UI.
-    virtual void OnUserSelected(const std::string& username) = 0;
+    // Sign out the currently signed in user.
+    // Used when the lock screen is being displayed.
+    virtual void Signout() = 0;
 
+    // Create new Google account.
+    virtual void CreateAccount() = 0;
+
+    // Complete sign process with specified |user_context|.
+    // Used for new users authenticated through an extension.
+    virtual void CompleteLogin(const UserContext& user_context) = 0;
+
+    // Notify the delegate when the sign-in UI is finished loading.
+    virtual void OnSigninScreenReady() = 0;
     // Called when the user requests enterprise enrollment.
     virtual void OnStartEnterpriseEnrollment() = 0;
 
@@ -90,20 +93,19 @@ class LoginDisplay : public RemoveUserDelegate {
     // Shows wrong HWID screen.
     virtual void ShowWrongHWIDScreen() = 0;
 
-    // Restarts the public-session auto-login timer if it is running.
-    virtual void ResetPublicSessionAutoLoginTimer() = 0;
-
-    // Ignore password change, remove existing cryptohome and
-    // force full sync of user data.
-    virtual void ResyncUserData() = 0;
-
     // Sets the displayed email for the next login attempt with |CompleteLogin|.
     // If it succeeds, user's displayed email value will be updated to |email|.
     virtual void SetDisplayEmail(const std::string& email) = 0;
 
-    // Sign out the currently signed in user.
-    // Used when the lock screen is being displayed.
-    virtual void Signout() = 0;
+    // Returns name of the currently connected network, for error message,
+    virtual base::string16 GetConnectedNetworkName() = 0;
+
+    // Called when existing user pod is selected in the UI.
+    virtual void OnUserSelected(
+        const std::string& username) = 0;  // Not called!
+
+    // Restarts the public-session auto-login timer if it is running.
+    virtual void ResetPublicSessionAutoLoginTimer() = 0;  //---
 
    protected:
     virtual ~Delegate();