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

Side by Side Diff: trunk/src/chrome/browser/chromeos/login/ui/webui_login_display.h

Issue 319633005: Revert 275492 "ChromeOS login webui refactoring : Simplify login..." (Closed) Base URL: svn://svn.chromium.org/chrome/
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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_UI_WEBUI_LOGIN_DISPLAY_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_UI_WEBUI_LOGIN_DISPLAY_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_UI_WEBUI_LOGIN_DISPLAY_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_UI_WEBUI_LOGIN_DISPLAY_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "chrome/browser/chromeos/login/screens/gaia_screen.h" 12 #include "chrome/browser/chromeos/login/screens/gaia_screen.h"
13 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h" 13 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h"
14 #include "chrome/browser/chromeos/login/signin_specifics.h"
15 #include "chrome/browser/chromeos/login/ui/login_display.h" 14 #include "chrome/browser/chromeos/login/ui/login_display.h"
16 #include "chrome/browser/chromeos/login/users/user.h" 15 #include "chrome/browser/chromeos/login/users/user.h"
17 #include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h" 16 #include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h"
18 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 17 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
19 #include "ui/views/widget/widget.h" 18 #include "ui/views/widget/widget.h"
20 #include "ui/wm/core/user_activity_observer.h" 19 #include "ui/wm/core/user_activity_observer.h"
21 20
22 namespace chromeos { 21 namespace chromeos {
23 // WebUI-based login UI implementation. 22 // WebUI-based login UI implementation.
24 class WebUILoginDisplay : public LoginDisplay, 23 class WebUILoginDisplay : public LoginDisplay,
(...skipping 21 matching lines...) Expand all
46 virtual void ShowErrorScreen(LoginDisplay::SigninError error_id) OVERRIDE; 45 virtual void ShowErrorScreen(LoginDisplay::SigninError error_id) OVERRIDE;
47 virtual void ShowGaiaPasswordChanged(const std::string& username) OVERRIDE; 46 virtual void ShowGaiaPasswordChanged(const std::string& username) OVERRIDE;
48 virtual void ShowPasswordChangedDialog(bool show_password_error) OVERRIDE; 47 virtual void ShowPasswordChangedDialog(bool show_password_error) OVERRIDE;
49 virtual void ShowSigninUI(const std::string& email) OVERRIDE; 48 virtual void ShowSigninUI(const std::string& email) OVERRIDE;
50 49
51 // NativeWindowDelegate implementation: 50 // NativeWindowDelegate implementation:
52 virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE; 51 virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE;
53 52
54 // SigninScreenHandlerDelegate implementation: 53 // SigninScreenHandlerDelegate implementation:
55 virtual void CancelPasswordChangedFlow() OVERRIDE; 54 virtual void CancelPasswordChangedFlow() OVERRIDE;
56 virtual void ResyncUserData() OVERRIDE; 55 virtual void CancelUserAdding() OVERRIDE;
57 virtual void MigrateUserData(const std::string& old_password) OVERRIDE;
58
59 virtual void Login(const UserContext& user_context,
60 const SigninSpecifics& specifics) OVERRIDE;
61 virtual bool IsSigninInProgress() const OVERRIDE;
62 virtual void Signout() OVERRIDE;
63 virtual void CreateAccount() OVERRIDE; 56 virtual void CreateAccount() OVERRIDE;
64 virtual void CompleteLogin(const UserContext& user_context) OVERRIDE; 57 virtual void CompleteLogin(const UserContext& user_context) OVERRIDE;
65 58 virtual void Login(const UserContext& user_context) OVERRIDE;
66 virtual void OnSigninScreenReady() OVERRIDE; 59 virtual void LoginAsRetailModeUser() OVERRIDE;
67 virtual void CancelUserAdding() OVERRIDE; 60 virtual void LoginAsGuest() OVERRIDE;
61 virtual void MigrateUserData(const std::string& old_password) OVERRIDE;
62 virtual void LoginAsPublicAccount(const std::string& username) OVERRIDE;
68 virtual void LoadWallpaper(const std::string& username) OVERRIDE; 63 virtual void LoadWallpaper(const std::string& username) OVERRIDE;
69 virtual void LoadSigninWallpaper() OVERRIDE; 64 virtual void LoadSigninWallpaper() OVERRIDE;
65 virtual void OnSigninScreenReady() OVERRIDE;
70 virtual void RemoveUser(const std::string& username) OVERRIDE; 66 virtual void RemoveUser(const std::string& username) OVERRIDE;
67 virtual void ResyncUserData() OVERRIDE;
71 virtual void ShowEnterpriseEnrollmentScreen() OVERRIDE; 68 virtual void ShowEnterpriseEnrollmentScreen() OVERRIDE;
72 virtual void ShowKioskEnableScreen() OVERRIDE; 69 virtual void ShowKioskEnableScreen() OVERRIDE;
73 virtual void ShowKioskAutolaunchScreen() OVERRIDE; 70 virtual void ShowKioskAutolaunchScreen() OVERRIDE;
74 virtual void ShowWrongHWIDScreen() OVERRIDE; 71 virtual void ShowWrongHWIDScreen() OVERRIDE;
75 virtual void SetWebUIHandler( 72 virtual void SetWebUIHandler(
76 LoginDisplayWebUIHandler* webui_handler) OVERRIDE; 73 LoginDisplayWebUIHandler* webui_handler) OVERRIDE;
77 virtual void ShowSigninScreenForCreds(const std::string& username, 74 virtual void ShowSigninScreenForCreds(const std::string& username,
78 const std::string& password); 75 const std::string& password);
79 virtual const UserList& GetUsers() const OVERRIDE; 76 virtual const UserList& GetUsers() const OVERRIDE;
80 virtual bool IsShowGuest() const OVERRIDE; 77 virtual bool IsShowGuest() const OVERRIDE;
81 virtual bool IsShowUsers() const OVERRIDE; 78 virtual bool IsShowUsers() const OVERRIDE;
79 virtual bool IsSigninInProgress() const OVERRIDE;
82 virtual bool IsUserSigninCompleted() const OVERRIDE; 80 virtual bool IsUserSigninCompleted() const OVERRIDE;
83 virtual void SetDisplayEmail(const std::string& email) OVERRIDE; 81 virtual void SetDisplayEmail(const std::string& email) OVERRIDE;
82 virtual void Signout() OVERRIDE;
83 virtual void LoginAsKioskApp(const std::string& app_id,
84 bool diagnostic_mode) OVERRIDE;
84 virtual void HandleGetUsers() OVERRIDE; 85 virtual void HandleGetUsers() OVERRIDE;
85 virtual void SetAuthType( 86 virtual void SetAuthType(
86 const std::string& username, 87 const std::string& username,
87 ScreenlockBridge::LockHandler::AuthType auth_type) OVERRIDE; 88 ScreenlockBridge::LockHandler::AuthType auth_type) OVERRIDE;
88 virtual ScreenlockBridge::LockHandler::AuthType GetAuthType( 89 virtual ScreenlockBridge::LockHandler::AuthType GetAuthType(
89 const std::string& username) const OVERRIDE; 90 const std::string& username) const OVERRIDE;
90 91
91 // wm::UserActivityDetector implementation: 92 // wm::UserActivityDetector implementation:
92 virtual void OnUserActivity(const ui::Event* event) OVERRIDE; 93 virtual void OnUserActivity(const ui::Event* event) OVERRIDE;
93 94
(...skipping 14 matching lines...) Expand all
108 109
109 scoped_ptr<GaiaScreen> gaia_screen_; 110 scoped_ptr<GaiaScreen> gaia_screen_;
110 scoped_ptr<UserSelectionScreen> user_selection_screen_; 111 scoped_ptr<UserSelectionScreen> user_selection_screen_;
111 112
112 DISALLOW_COPY_AND_ASSIGN(WebUILoginDisplay); 113 DISALLOW_COPY_AND_ASSIGN(WebUILoginDisplay);
113 }; 114 };
114 115
115 } // namespace chromeos 116 } // namespace chromeos
116 117
117 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_UI_WEBUI_LOGIN_DISPLAY_H_ 118 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_UI_WEBUI_LOGIN_DISPLAY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698