Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5360)

Unified Diff: chrome/browser/chromeos/login/login_performer.h

Issue 10918027: Revert 154457 - Switch from SignedSettings to DeviceSettingsService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/login_performer.h
===================================================================
--- chrome/browser/chromeos/login/login_performer.h (revision 154482)
+++ chrome/browser/chromeos/login/login_performer.h (working copy)
@@ -54,13 +54,6 @@
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:
@@ -91,13 +84,13 @@
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();
@@ -134,6 +127,12 @@
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:
« no previous file with comments | « chrome/browser/chromeos/login/language_switch_menu.cc ('k') | chrome/browser/chromeos/login/login_performer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698