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

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

Issue 2107353002: Fix the flaky test KioskTest.LaunchAppUserCancel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: UI_STATE_UNKNOWN Created 4 years, 5 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
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
(...skipping 18 matching lines...) Expand all
29 public ui::UserActivityObserver { 29 public ui::UserActivityObserver {
30 public: 30 public:
31 explicit WebUILoginDisplay(LoginDisplay::Delegate* delegate); 31 explicit WebUILoginDisplay(LoginDisplay::Delegate* delegate);
32 ~WebUILoginDisplay() override; 32 ~WebUILoginDisplay() override;
33 33
34 // LoginDisplay implementation: 34 // LoginDisplay implementation:
35 void ClearAndEnablePassword() override; 35 void ClearAndEnablePassword() override;
36 void Init(const user_manager::UserList& users, 36 void Init(const user_manager::UserList& users,
37 bool show_guest, 37 bool show_guest,
38 bool show_users, 38 bool show_users,
39 bool show_new_user) override; 39 bool allow_new_user) override;
40 void OnPreferencesChanged() override; 40 void OnPreferencesChanged() override;
41 void RemoveUser(const AccountId& account_id) override; 41 void RemoveUser(const AccountId& account_id) override;
42 void SetUIEnabled(bool is_enabled) override; 42 void SetUIEnabled(bool is_enabled) override;
43 void ShowError(int error_msg_id, 43 void ShowError(int error_msg_id,
44 int login_attempts, 44 int login_attempts,
45 HelpAppLauncher::HelpTopic help_topic_id) override; 45 HelpAppLauncher::HelpTopic help_topic_id) override;
46 void ShowErrorScreen(LoginDisplay::SigninError error_id) override; 46 void ShowErrorScreen(LoginDisplay::SigninError error_id) override;
47 void ShowPasswordChangedDialog(bool show_password_error, 47 void ShowPasswordChangedDialog(bool show_password_error,
48 const std::string& email) override; 48 const std::string& email) override;
49 void ShowSigninUI(const std::string& email) override; 49 void ShowSigninUI(const std::string& email) override;
(...skipping 21 matching lines...) Expand all
71 void ShowEnterpriseEnrollmentScreen() override; 71 void ShowEnterpriseEnrollmentScreen() override;
72 void ShowEnableDebuggingScreen() override; 72 void ShowEnableDebuggingScreen() override;
73 void ShowKioskEnableScreen() override; 73 void ShowKioskEnableScreen() override;
74 void ShowKioskAutolaunchScreen() override; 74 void ShowKioskAutolaunchScreen() override;
75 void ShowWrongHWIDScreen() override; 75 void ShowWrongHWIDScreen() override;
76 void SetWebUIHandler(LoginDisplayWebUIHandler* webui_handler) override; 76 void SetWebUIHandler(LoginDisplayWebUIHandler* webui_handler) override;
77 virtual void ShowSigninScreenForCreds(const std::string& username, 77 virtual void ShowSigninScreenForCreds(const std::string& username,
78 const std::string& password); 78 const std::string& password);
79 bool IsShowGuest() const override; 79 bool IsShowGuest() const override;
80 bool IsShowUsers() const override; 80 bool IsShowUsers() const override;
81 bool ShowUsersHasChanged() const override;
82 bool IsAllowNewUser() const override;
83 bool AllowNewUserChanged() const override;
81 bool IsUserSigninCompleted() const override; 84 bool IsUserSigninCompleted() const override;
82 void SetDisplayEmail(const std::string& email) override; 85 void SetDisplayEmail(const std::string& email) override;
83 86
84 void HandleGetUsers() override; 87 void HandleGetUsers() override;
85 void CheckUserStatus(const AccountId& account_id) override; 88 void CheckUserStatus(const AccountId& account_id) override;
86 bool IsUserWhitelisted(const AccountId& account_id) override; 89 bool IsUserWhitelisted(const AccountId& account_id) override;
87 90
88 // ui::UserActivityDetector implementation: 91 // ui::UserActivityDetector implementation:
89 void OnUserActivity(const ui::Event* event) override; 92 void OnUserActivity(const ui::Event* event) override;
90 93
91 private: 94 private:
92 95
93 // Whether to show guest login. 96 // Whether to show guest login.
94 bool show_guest_ = false; 97 bool show_guest_ = false;
95 98
96 // Weather to show the user pods or a GAIA sign in. 99 // Whether to show the user pods or a GAIA sign in.
97 // Public sessions are always shown. 100 // Public sessions are always shown.
98 bool show_users_ = false; 101 bool show_users_ = false;
99 102
103 // Whether the create new account option in GAIA is enabled by the setting.
104 bool show_users_changed_ = false;
105
100 // Whether to show add new user. 106 // Whether to show add new user.
101 bool show_new_user_ = false; 107 bool allow_new_user_ = false;
108
109 // Whether the allow new user setting has changed.
110 bool allow_new_user_changed_ = false;
102 111
103 // Reference to the WebUI handling layer for the login screen 112 // Reference to the WebUI handling layer for the login screen
104 LoginDisplayWebUIHandler* webui_handler_ = nullptr; 113 LoginDisplayWebUIHandler* webui_handler_ = nullptr;
105 114
106 DISALLOW_COPY_AND_ASSIGN(WebUILoginDisplay); 115 DISALLOW_COPY_AND_ASSIGN(WebUILoginDisplay);
107 }; 116 };
108 117
109 } // namespace chromeos 118 } // namespace chromeos
110 119
111 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_UI_WEBUI_LOGIN_DISPLAY_H_ 120 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_UI_WEBUI_LOGIN_DISPLAY_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/kiosk_browsertest.cc ('k') | chrome/browser/chromeos/login/ui/webui_login_display.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698