| Index: chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc
|
| diff --git a/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc b/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc
|
| index dfe4f1b18e4b3e86d2e8d71eb4b0f1d241a2b245..4d8d4f49a7dddae015e60722100ecb72bf91ede9 100644
|
| --- a/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc
|
| +++ b/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc
|
| @@ -26,23 +26,23 @@ namespace screenlock = api::screenlock_private;
|
| namespace {
|
|
|
| screenlock::AuthType FromLockHandlerAuthType(
|
| - proximity_auth::ScreenlockBridge::LockHandler::AuthType auth_type) {
|
| + proximity_auth::mojom::AuthType auth_type) {
|
| switch (auth_type) {
|
| - case proximity_auth::ScreenlockBridge::LockHandler::OFFLINE_PASSWORD:
|
| + case proximity_auth::mojom::AuthType::OFFLINE_PASSWORD:
|
| return screenlock::AUTH_TYPE_OFFLINEPASSWORD;
|
| - case proximity_auth::ScreenlockBridge::LockHandler::NUMERIC_PIN:
|
| + case proximity_auth::mojom::AuthType::NUMERIC_PIN:
|
| return screenlock::AUTH_TYPE_NUMERICPIN;
|
| - case proximity_auth::ScreenlockBridge::LockHandler::USER_CLICK:
|
| + case proximity_auth::mojom::AuthType::USER_CLICK:
|
| return screenlock::AUTH_TYPE_USERCLICK;
|
| - case proximity_auth::ScreenlockBridge::LockHandler::ONLINE_SIGN_IN:
|
| + case proximity_auth::mojom::AuthType::ONLINE_SIGN_IN:
|
| // Apps should treat forced online sign in same as system password.
|
| return screenlock::AUTH_TYPE_OFFLINEPASSWORD;
|
| - case proximity_auth::ScreenlockBridge::LockHandler::EXPAND_THEN_USER_CLICK:
|
| + case proximity_auth::mojom::AuthType::EXPAND_THEN_USER_CLICK:
|
| // This type is used for public sessions, which do not support screen
|
| // locking.
|
| NOTREACHED();
|
| return screenlock::AUTH_TYPE_NONE;
|
| - case proximity_auth::ScreenlockBridge::LockHandler::FORCE_OFFLINE_PASSWORD:
|
| + case proximity_auth::mojom::AuthType::FORCE_OFFLINE_PASSWORD:
|
| return screenlock::AUTH_TYPE_OFFLINEPASSWORD;
|
| }
|
| NOTREACHED();
|
| @@ -161,7 +161,7 @@ void ScreenlockPrivateEventRouter::Shutdown() {
|
| }
|
|
|
| bool ScreenlockPrivateEventRouter::OnAuthAttempted(
|
| - proximity_auth::ScreenlockBridge::LockHandler::AuthType auth_type,
|
| + proximity_auth::mojom::AuthType auth_type,
|
| const std::string& value) {
|
| EventRouter* router = EventRouter::Get(browser_context_);
|
| if (!router->HasEventListener(screenlock::OnAuthAttempted::kEventName))
|
|
|