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

Unified Diff: chrome/browser/chromeos/login/ui/webui_login_display.h

Issue 324463003: ChromeOS login webui refactoring : Simplify login methods. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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/ui/webui_login_display.h
diff --git a/chrome/browser/chromeos/login/ui/webui_login_display.h b/chrome/browser/chromeos/login/ui/webui_login_display.h
index da1cb779237d8367554a9131a5dd08f2d99530a8..351c3e1deaa419d79e493ffc30a989d9cfdd09b1 100644
--- a/chrome/browser/chromeos/login/ui/webui_login_display.h
+++ b/chrome/browser/chromeos/login/ui/webui_login_display.h
@@ -11,6 +11,7 @@
#include "base/compiler_specific.h"
#include "chrome/browser/chromeos/login/screens/gaia_screen.h"
#include "chrome/browser/chromeos/login/screens/user_selection_screen.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.h"
#include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h"
@@ -55,11 +56,12 @@ class WebUILoginDisplay : public LoginDisplay,
virtual void CancelUserAdding() OVERRIDE;
virtual void CreateAccount() OVERRIDE;
virtual void CompleteLogin(const UserContext& user_context) OVERRIDE;
- virtual void Login(const UserContext& user_context) OVERRIDE;
- virtual void LoginAsRetailModeUser() OVERRIDE;
- virtual void LoginAsGuest() OVERRIDE;
+ virtual void Login(const UserContext& user_context,
+ const SigninSpecifics& specifics) OVERRIDE;
+ // virtual void LoginAsRetailModeUser() OVERRIDE;
Nikita (slow) 2014/06/06 14:49:48 No longer used, may be removed.
Denis Kuznetsov (DE-MUC) 2014/06/06 15:18:42 Done.
+ // virtual void LoginAsGuest() OVERRIDE;
virtual void MigrateUserData(const std::string& old_password) OVERRIDE;
- virtual void LoginAsPublicAccount(const std::string& username) OVERRIDE;
+ // virtual void LoginAsPublicAccount(const std::string& username) OVERRIDE;
virtual void LoadWallpaper(const std::string& username) OVERRIDE;
virtual void LoadSigninWallpaper() OVERRIDE;
virtual void OnSigninScreenReady() OVERRIDE;
@@ -80,8 +82,6 @@ class WebUILoginDisplay : public LoginDisplay,
virtual bool IsUserSigninCompleted() const OVERRIDE;
virtual void SetDisplayEmail(const std::string& email) OVERRIDE;
virtual void Signout() OVERRIDE;
- virtual void LoginAsKioskApp(const std::string& app_id,
- bool diagnostic_mode) OVERRIDE;
virtual void HandleGetUsers() OVERRIDE;
virtual void SetAuthType(
const std::string& username,

Powered by Google App Engine
This is Rietveld 408576698