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

Side by Side Diff: chrome/browser/chromeos/login/screens/user_selection_screen.h

Issue 1494153002: This CL replaces e-mail with AccountId in easy signin code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Bugfix in original easy unlock code' Created 5 years 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_SCREENS_USER_SELECTION_SCREEN_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_SELECTION_SCREEN_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_SELECTION_SCREEN_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_SELECTION_SCREEN_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 void CheckUserStatus(const AccountId& account_id); 57 void CheckUserStatus(const AccountId& account_id);
58 58
59 // ui::UserActivityDetector implementation: 59 // ui::UserActivityDetector implementation:
60 void OnUserActivity(const ui::Event* event) override; 60 void OnUserActivity(const ui::Event* event) override;
61 61
62 void InitEasyUnlock(); 62 void InitEasyUnlock();
63 63
64 // proximity_auth::ScreenlockBridge::LockHandler implementation: 64 // proximity_auth::ScreenlockBridge::LockHandler implementation:
65 void ShowBannerMessage(const base::string16& message) override; 65 void ShowBannerMessage(const base::string16& message) override;
66 void ShowUserPodCustomIcon( 66 void ShowUserPodCustomIcon(
67 const std::string& user_email, 67 const AccountId& account_id,
68 const proximity_auth::ScreenlockBridge::UserPodCustomIconOptions& icon) 68 const proximity_auth::ScreenlockBridge::UserPodCustomIconOptions& icon)
69 override; 69 override;
70 void HideUserPodCustomIcon(const std::string& user_email) override; 70 void HideUserPodCustomIcon(const AccountId& account_id) override;
71 71
72 void EnableInput() override; 72 void EnableInput() override;
73 void SetAuthType(const std::string& user_email, 73 void SetAuthType(const AccountId& account_id,
74 AuthType auth_type, 74 AuthType auth_type,
75 const base::string16& auth_value) override; 75 const base::string16& auth_value) override;
76 AuthType GetAuthType(const std::string& user_email) const override; 76 AuthType GetAuthType(const AccountId& account_id) const override;
77 ScreenType GetScreenType() const override; 77 ScreenType GetScreenType() const override;
78 78
79 void Unlock(const std::string& user_email) override; 79 void Unlock(const AccountId& account_id) override;
80 void AttemptEasySignin(const std::string& user_email, 80 void AttemptEasySignin(const AccountId& account_id,
81 const std::string& secret, 81 const std::string& secret,
82 const std::string& key_label) override; 82 const std::string& key_label) override;
83 83
84 // UserBoardModel implementation. 84 // UserBoardModel implementation.
85 void SendUserList() override; 85 void SendUserList() override;
86 void HardLockPod(const AccountId& account_id) override; 86 void HardLockPod(const AccountId& account_id) override;
87 void AttemptEasyUnlock(const AccountId& account_id) override; 87 void AttemptEasyUnlock(const AccountId& account_id) override;
88 void RecordClickOnLockIcon(const AccountId& account_id) override; 88 void RecordClickOnLockIcon(const AccountId& account_id) override;
89 89
90 // Fills |user_dict| with information about |user|. 90 // Fills |user_dict| with information about |user|.
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 scoped_ptr<TokenHandleUtil> token_handle_util_; 146 scoped_ptr<TokenHandleUtil> token_handle_util_;
147 147
148 base::WeakPtrFactory<UserSelectionScreen> weak_factory_; 148 base::WeakPtrFactory<UserSelectionScreen> weak_factory_;
149 149
150 DISALLOW_COPY_AND_ASSIGN(UserSelectionScreen); 150 DISALLOW_COPY_AND_ASSIGN(UserSelectionScreen);
151 }; 151 };
152 152
153 } // namespace chromeos 153 } // namespace chromeos
154 154
155 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_SELECTION_SCREEN_H_ 155 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_SELECTION_SCREEN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698