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

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

Issue 1096293003: Move screenlock_bridge to components/proximity_auth (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix linux build Created 5 years, 8 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_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>
11 11
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/timer/timer.h" 13 #include "base/timer/timer.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "chrome/browser/chromeos/login/signin/token_handle_util.h" 15 #include "chrome/browser/chromeos/login/signin/token_handle_util.h"
16 #include "chrome/browser/chromeos/login/ui/login_display.h" 16 #include "chrome/browser/chromeos/login/ui/login_display.h"
17 #include "chrome/browser/chromeos/login/ui/models/user_board_model.h" 17 #include "chrome/browser/chromeos/login/ui/models/user_board_model.h"
18 #include "chrome/browser/signin/screenlock_bridge.h" 18 #include "components/signin/content/screenlock_bridge.h"
19 #include "components/user_manager/user.h" 19 #include "components/user_manager/user.h"
20 #include "components/user_manager/user_id.h" 20 #include "components/user_manager/user_id.h"
21 #include "ui/base/user_activity/user_activity_observer.h" 21 #include "ui/base/user_activity/user_activity_observer.h"
22 22
23 class EasyUnlockService; 23 class EasyUnlockService;
24 24
25 namespace chromeos { 25 namespace chromeos {
26 26
27 class LoginDisplayWebUIHandler; 27 class LoginDisplayWebUIHandler;
28 class UserBoardView; 28 class UserBoardView;
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 const ScreenlockBridge::UserPodCustomIconOptions& icon) override; 68 const ScreenlockBridge::UserPodCustomIconOptions& icon) override;
69 void HideUserPodCustomIcon(const std::string& user_email) override; 69 void HideUserPodCustomIcon(const std::string& user_email) override;
70 70
71 void EnableInput() override; 71 void EnableInput() override;
72 void SetAuthType(const std::string& user_email, 72 void SetAuthType(const std::string& user_email,
73 AuthType auth_type, 73 AuthType auth_type,
74 const base::string16& auth_value) override; 74 const base::string16& auth_value) override;
75 AuthType GetAuthType(const std::string& user_email) const override; 75 AuthType GetAuthType(const std::string& user_email) const override;
76 ScreenType GetScreenType() const override; 76 ScreenType GetScreenType() const override;
77 77
78 void Lock(content::BrowserContext* browser_context) override;
79 void Unlock(content::BrowserContext* browser_context) override;
78 void Unlock(const std::string& user_email) override; 80 void Unlock(const std::string& user_email) override;
79 void AttemptEasySignin(const std::string& user_email, 81 void AttemptEasySignin(const std::string& user_email,
80 const std::string& secret, 82 const std::string& secret,
81 const std::string& key_label) override; 83 const std::string& key_label) override;
82 84
83 // UserBoardModel implementation. 85 // UserBoardModel implementation.
84 void SendUserList() override; 86 void SendUserList() override;
85 void HardLockPod(const std::string& user_id) override; 87 void HardLockPod(const std::string& user_id) override;
86 void AttemptEasyUnlock(const std::string& user_id) override; 88 void AttemptEasyUnlock(const std::string& user_id) override;
87 void RecordClickOnLockIcon(const std::string& user_id) override; 89 void RecordClickOnLockIcon(const std::string& user_id) override;
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 scoped_ptr<TokenHandleUtil> token_handle_util_; 147 scoped_ptr<TokenHandleUtil> token_handle_util_;
146 148
147 base::WeakPtrFactory<UserSelectionScreen> weak_factory_; 149 base::WeakPtrFactory<UserSelectionScreen> weak_factory_;
148 150
149 DISALLOW_COPY_AND_ASSIGN(UserSelectionScreen); 151 DISALLOW_COPY_AND_ASSIGN(UserSelectionScreen);
150 }; 152 };
151 153
152 } // namespace chromeos 154 } // namespace chromeos
153 155
154 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_SELECTION_SCREEN_H_ 156 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_SELECTION_SCREEN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698