| Index: chrome/browser/extensions/api/screenlock_private/screenlock_private_api.h
|
| diff --git a/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.h b/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.h
|
| index fb87f122a659f37abcad4f283ef5e9b072b0ebf8..d120c46eca93c07b5aff037ddd5c48693bb82c26 100644
|
| --- a/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.h
|
| +++ b/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.h
|
| @@ -8,7 +8,7 @@
|
| #include <string>
|
|
|
| #include "chrome/browser/extensions/chrome_extension_function.h"
|
| -#include "chrome/browser/signin/screenlock_bridge.h"
|
| +#include "components/proximity_auth/screenlock_bridge.h"
|
| #include "extensions/browser/browser_context_keyed_api_factory.h"
|
|
|
| namespace extensions {
|
| @@ -50,14 +50,16 @@ class ScreenlockPrivateAcceptAuthAttemptFunction
|
| DISALLOW_COPY_AND_ASSIGN(ScreenlockPrivateAcceptAuthAttemptFunction);
|
| };
|
|
|
| -class ScreenlockPrivateEventRouter : public extensions::BrowserContextKeyedAPI,
|
| - public ScreenlockBridge::Observer {
|
| +class ScreenlockPrivateEventRouter
|
| + : public extensions::BrowserContextKeyedAPI,
|
| + public proximity_auth::ScreenlockBridge::Observer {
|
| public:
|
| explicit ScreenlockPrivateEventRouter(content::BrowserContext* context);
|
| ~ScreenlockPrivateEventRouter() override;
|
|
|
| - bool OnAuthAttempted(ScreenlockBridge::LockHandler::AuthType auth_type,
|
| - const std::string& value);
|
| + bool OnAuthAttempted(
|
| + proximity_auth::ScreenlockBridge::LockHandler::AuthType auth_type,
|
| + const std::string& value);
|
|
|
| // BrowserContextKeyedAPI
|
| static extensions::BrowserContextKeyedAPIFactory<
|
| @@ -65,11 +67,12 @@ class ScreenlockPrivateEventRouter : public extensions::BrowserContextKeyedAPI,
|
| GetFactoryInstance();
|
| void Shutdown() override;
|
|
|
| - // ScreenlockBridge::Observer
|
| - void OnScreenDidLock(
|
| - ScreenlockBridge::LockHandler::ScreenType screen_type) override;
|
| + // proximity_auth::ScreenlockBridge::Observer
|
| + 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;
|
|
|
| private:
|
|
|