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

Unified Diff: chrome/browser/signin/easy_unlock_service_regular.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
« no previous file with comments | « chrome/browser/signin/easy_unlock_service.cc ('k') | chrome/browser/signin/easy_unlock_service_regular.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/signin/easy_unlock_service_regular.h
diff --git a/chrome/browser/signin/easy_unlock_service_regular.h b/chrome/browser/signin/easy_unlock_service_regular.h
index 324d234c9cdebd946e6c42133934d86d021f14ae..1f4ff9d605b060a5c6d5f7bcde9b2063de153511 100644
--- a/chrome/browser/signin/easy_unlock_service_regular.h
+++ b/chrome/browser/signin/easy_unlock_service_regular.h
@@ -13,7 +13,7 @@
#include "base/prefs/pref_change_registrar.h"
#include "base/time/time.h"
#include "chrome/browser/signin/easy_unlock_service.h"
-#include "chrome/browser/signin/screenlock_bridge.h"
+#include "components/proximity_auth/screenlock_bridge.h"
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/login/easy_unlock/short_lived_user_context.h"
@@ -38,8 +38,9 @@ class Profile;
// EasyUnlockService instance that should be used for regular, non-signin
// profiles.
-class EasyUnlockServiceRegular : public EasyUnlockService,
- public ScreenlockBridge::Observer {
+class EasyUnlockServiceRegular
+ : public EasyUnlockService,
+ public proximity_auth::ScreenlockBridge::Observer {
public:
explicit EasyUnlockServiceRegular(Profile* profile);
~EasyUnlockServiceRegular() override;
@@ -70,11 +71,12 @@ class EasyUnlockServiceRegular : 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;
« no previous file with comments | « chrome/browser/signin/easy_unlock_service.cc ('k') | chrome/browser/signin/easy_unlock_service_regular.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698