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

Side by Side Diff: chrome/browser/chromeos/login/app_launch_signin_screen.h

Issue 1454153002: Revert of This CL replaces e-mail with AccountId on user selection screen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_APP_LAUNCH_SIGNIN_SCREEN_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_APP_LAUNCH_SIGNIN_SCREEN_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_APP_LAUNCH_SIGNIN_SCREEN_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_APP_LAUNCH_SIGNIN_SCREEN_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
11 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 11 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
12 #include "chromeos/login/auth/auth_status_consumer.h" 12 #include "chromeos/login/auth/auth_status_consumer.h"
13 #include "chromeos/login/auth/authenticator.h" 13 #include "chromeos/login/auth/authenticator.h"
14 #include "components/proximity_auth/screenlock_bridge.h" 14 #include "components/proximity_auth/screenlock_bridge.h"
15 #include "components/user_manager/user.h" 15 #include "components/user_manager/user.h"
16 #include "components/user_manager/user_manager.h" 16 #include "components/user_manager/user_manager.h"
17 17
18 class AccountId;
19
20 namespace chromeos { 18 namespace chromeos {
21 19
22 class OobeUI; 20 class OobeUI;
23 21
24 // The app launch signin screen shows the user pod of the device owner 22 // The app launch signin screen shows the user pod of the device owner
25 // and requires the user to login in order to access the network dialog. 23 // and requires the user to login in order to access the network dialog.
26 // This screen is quite similar to the standard lock screen, but we do not 24 // This screen is quite similar to the standard lock screen, but we do not
27 // create a new view to superimpose over the desktop. 25 // create a new view to superimpose over the desktop.
28 // 26 //
29 // TODO(tengs): This class doesn't quite follow the idiom of the other 27 // TODO(tengs): This class doesn't quite follow the idiom of the other
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 void SetWebUIHandler(LoginDisplayWebUIHandler* webui_handler) override; 70 void SetWebUIHandler(LoginDisplayWebUIHandler* webui_handler) override;
73 virtual void ShowSigninScreenForCreds(const std::string& username, 71 virtual void ShowSigninScreenForCreds(const std::string& username,
74 const std::string& password); 72 const std::string& password);
75 bool IsShowGuest() const override; 73 bool IsShowGuest() const override;
76 bool IsShowUsers() const override; 74 bool IsShowUsers() const override;
77 bool IsSigninInProgress() const override; 75 bool IsSigninInProgress() const override;
78 bool IsUserSigninCompleted() const override; 76 bool IsUserSigninCompleted() const override;
79 void SetDisplayEmail(const std::string& email) override; 77 void SetDisplayEmail(const std::string& email) override;
80 void Signout() override; 78 void Signout() override;
81 void HandleGetUsers() override; 79 void HandleGetUsers() override;
82 void CheckUserStatus(const AccountId& account_id) override; 80 void CheckUserStatus(const std::string& user_id) override;
83 bool IsUserWhitelisted(const std::string& user_id) override; 81 bool IsUserWhitelisted(const std::string& user_id) override;
84 82
85 // AuthStatusConsumer implementation: 83 // AuthStatusConsumer implementation:
86 void OnAuthFailure(const AuthFailure& error) override; 84 void OnAuthFailure(const AuthFailure& error) override;
87 void OnAuthSuccess(const UserContext& user_context) override; 85 void OnAuthSuccess(const UserContext& user_context) override;
88 86
89 OobeUI* oobe_ui_; 87 OobeUI* oobe_ui_;
90 Delegate* delegate_; 88 Delegate* delegate_;
91 LoginDisplayWebUIHandler* webui_handler_; 89 LoginDisplayWebUIHandler* webui_handler_;
92 scoped_refptr<Authenticator> authenticator_; 90 scoped_refptr<Authenticator> authenticator_;
93 91
94 // This list should have at most one user, and that user should be the owner. 92 // This list should have at most one user, and that user should be the owner.
95 user_manager::UserList owner_user_list_; 93 user_manager::UserList owner_user_list_;
96 94
97 static user_manager::UserManager* test_user_manager_; 95 static user_manager::UserManager* test_user_manager_;
98 96
99 DISALLOW_COPY_AND_ASSIGN(AppLaunchSigninScreen); 97 DISALLOW_COPY_AND_ASSIGN(AppLaunchSigninScreen);
100 }; 98 };
101 99
102 } // namespace chromeos 100 } // namespace chromeos
103 101
104 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_APP_LAUNCH_SIGNIN_SCREEN_H_ 102 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_APP_LAUNCH_SIGNIN_SCREEN_H_
OLDNEW
« no previous file with comments | « ash/test/test_session_state_delegate.cc ('k') | chrome/browser/chromeos/login/app_launch_signin_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698