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

Unified Diff: chrome/browser/signin/easy_unlock_service_signin_chromeos.h

Issue 1096293003: Move screenlock_bridge to components/proximity_auth (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/signin/easy_unlock_service_signin_chromeos.h
diff --git a/chrome/browser/signin/easy_unlock_service_signin_chromeos.h b/chrome/browser/signin/easy_unlock_service_signin_chromeos.h
index 94b3cef951ee3d85c3239d409f759a07f1f29706..634de98d5bac2ec2007c02345c4011674d89b2a8 100644
--- a/chrome/browser/signin/easy_unlock_service_signin_chromeos.h
+++ b/chrome/browser/signin/easy_unlock_service_signin_chromeos.h
@@ -15,13 +15,14 @@
#include "base/values.h"
#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_types.h"
#include "chrome/browser/signin/easy_unlock_service.h"
-#include "chrome/browser/signin/screenlock_bridge.h"
#include "chromeos/login/login_state.h"
+#include "components/proximity_auth/screenlock_bridge.h"
// EasyUnlockService instance that should be used for signin profile.
-class EasyUnlockServiceSignin : public EasyUnlockService,
- public ScreenlockBridge::Observer,
- public chromeos::LoginState::Observer {
+class EasyUnlockServiceSignin
+ : public EasyUnlockService,
+ public proximity_auth::ScreenlockBridge::Observer,
+ public chromeos::LoginState::Observer {
public:
explicit EasyUnlockServiceSignin(Profile* profile);
~EasyUnlockServiceSignin() override;
@@ -85,11 +86,12 @@ class EasyUnlockServiceSignin : public EasyUnlockService,
void OnWillFinalizeUnlock(bool success) override;
void OnSuspendDone() override;
- // ScreenlockBridge::Observer implementation:
- void OnScreenDidLock(
- ScreenlockBridge::LockHandler::ScreenType screen_type) override;
+ // proximity_auth::ScreenlockBridge::Observer implementation:
+ void OnScreenDidLock(proximity_auth::ScreenlockBridge::LockHandler::ScreenType
+ screen_type) override;
void OnScreenDidUnlock(
- ScreenlockBridge::LockHandler::ScreenType screen_type) override;
+ proximity_auth::ScreenlockBridge::LockHandler::ScreenType screen_type)
+ override;
void OnFocusedUserChanged(const std::string& user_id) override;
// chromeos::LoginState::Observer implementation:
« no previous file with comments | « chrome/browser/signin/easy_unlock_service_regular.cc ('k') | chrome/browser/signin/easy_unlock_service_signin_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698