Revert 154457 - Switch from SignedSettings to DeviceSettingsService.

chrome/browser/chromeos/login/login_performer.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_LOGIN_LOGIN_PERFORMER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_LOGIN_PERFORMER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 36 matching lines @@
 // input & error messages display is dedicated to ScreenLocker instance.
 //
 // 2 things make LoginPerfrormer instance exist longer:
 // 1. ScreenLock active (pending correct new password input)
 // 2. Pending online auth request.
 // TODO(nkostylev): Cleanup ClientLogin related code, update class description.
 class LoginPerformer : public LoginStatusConsumer,
                        public content::NotificationObserver,
                        public OnlineAttemptHost::Delegate {
  public:
-  typedef enum AuthorizationMode {
-    // Authorization performed internally by Chrome.
-    AUTH_MODE_INTERNAL,
-    // Authorization performed by an extension.
-    AUTH_MODE_EXTENSION
-  } AuthorizationMode;
-
   // Delegate class to get notifications from the LoginPerformer.
   class Delegate : public LoginStatusConsumer {
    public:
     virtual ~Delegate() {}
     virtual void WhiteListCheckFailed(const std::string& email) = 0;
     virtual void PolicyLoadFailed() = 0;
     virtual void OnOnlineChecked(const std::string& email, bool success) = 0;
   };
 
   explicit LoginPerformer(Delegate* delegate);
@@ skipping 10 matching lines @@
   virtual void OnLoginFailure(const LoginFailure& error) OVERRIDE;
   virtual void OnDemoUserLoginSuccess() OVERRIDE;
   virtual void OnLoginSuccess(
       const std::string& username,
       const std::string& password,
       bool pending_requests,
       bool using_oauth) OVERRIDE;
   virtual void OnOffTheRecordLoginSuccess() OVERRIDE;
   virtual void OnPasswordChangeDetected() OVERRIDE;
 
-  // Performs a login for |username| and |password|. If auth_mode is
-  // AUTH_MODE_EXTENSION, there are no further auth checks, AUTH_MODE_INTERNAL
-  // will perform auth checks.
-  void PerformLogin(const std::string& username,
-                    const std::string& password,
-                    AuthorizationMode auth_mode);
+  // Completes login process that has already been authenticated with
+  // provided |username| and |password|.
+  void CompleteLogin(const std::string& username, const std::string& password);
+
+  // Performs login with the |username| and |password| specified.
+  void Login(const std::string& username, const std::string& password);
 
   // Performs login for the demo user.
   void LoginDemoUser();
 
   // Performs actions to prepare Guest mode login.
   void LoginOffTheRecord();
 
   // Migrates cryptohome using |old_password| specified.
   void RecoverEncryptedData(const std::string& old_password);
 
@@ skipping 17 matching lines @@
   // If user enters incorrect old password, same LoginPerformer instance will
   // be called so callback count makes it possible to distinguish initial
   // "password changed detected" event from further attempts to enter old
   // password for cryptohome migration (when > 1).
   int password_changed_callback_count() {
     return password_changed_callback_count_;
   }
 
   void set_delegate(Delegate* delegate) { delegate_ = delegate; }
 
+  typedef enum AuthorizationMode {
+    // Authorization performed internally by Chrome.
+    AUTH_MODE_INTERNAL,
+    // Authorization performed by an extension.
+    AUTH_MODE_EXTENSION
+  } AuthorizationMode;
   AuthorizationMode auth_mode() const { return auth_mode_; }
 
  protected:
   // Implements OnlineAttemptHost::Delegate.
   virtual void OnChecked(const std::string& username, bool success) OVERRIDE;
 
  private:
   // content::NotificationObserver implementation:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
@@ skipping 74 matching lines @@
   bool using_oauth_;
 
   base::WeakPtrFactory<LoginPerformer> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(LoginPerformer);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_LOGIN_PERFORMER_H_