Index: chrome/browser/signin/easy_unlock_screenlock_state_handler.cc |
diff --git a/chrome/browser/signin/easy_unlock_screenlock_state_handler.cc b/chrome/browser/signin/easy_unlock_screenlock_state_handler.cc |
index 6ab4c442b87ea96c8387ad8ae2d6cf72936927e1..87d847b9ff009efffe1030b88573a5a77d41ab55 100644 |
--- a/chrome/browser/signin/easy_unlock_screenlock_state_handler.cc |
+++ b/chrome/browser/signin/easy_unlock_screenlock_state_handler.cc |
@@ -152,7 +152,7 @@ void EasyUnlockScreenlockStateHandler::ChangeState(ScreenlockState new_state) { |
// Do nothing when auth type is online. |
if (screenlock_bridge_->lock_handler()->GetAuthType(account_id_) == |
- proximity_auth::ScreenlockBridge::LockHandler::ONLINE_SIGN_IN) { |
+ proximity_auth::mojom::AuthType::ONLINE_SIGN_IN) { |
return; |
} |
@@ -271,18 +271,14 @@ void EasyUnlockScreenlockStateHandler::ShowHardlockUI() { |
return; |
// Do not override online signin. |
- const proximity_auth::ScreenlockBridge::LockHandler::AuthType |
- existing_auth_type = |
- screenlock_bridge_->lock_handler()->GetAuthType(account_id_); |
- if (existing_auth_type == |
- proximity_auth::ScreenlockBridge::LockHandler::ONLINE_SIGN_IN) |
+ const proximity_auth::mojom::AuthType existing_auth_type = |
+ screenlock_bridge_->lock_handler()->GetAuthType(account_id_); |
+ if (existing_auth_type == proximity_auth::mojom::AuthType::ONLINE_SIGN_IN) |
return; |
- if (existing_auth_type != |
- proximity_auth::ScreenlockBridge::LockHandler::OFFLINE_PASSWORD) { |
+ if (existing_auth_type != proximity_auth::mojom::AuthType::OFFLINE_PASSWORD) { |
screenlock_bridge_->lock_handler()->SetAuthType( |
- account_id_, |
- proximity_auth::ScreenlockBridge::LockHandler::OFFLINE_PASSWORD, |
+ account_id_, proximity_auth::mojom::AuthType::OFFLINE_PASSWORD, |
base::string16()); |
} |
@@ -377,26 +373,22 @@ void EasyUnlockScreenlockStateHandler::UpdateScreenlockAuthType() { |
return; |
// Do not override online signin. |
- const proximity_auth::ScreenlockBridge::LockHandler::AuthType |
- existing_auth_type = |
- screenlock_bridge_->lock_handler()->GetAuthType(account_id_); |
- DCHECK_NE(proximity_auth::ScreenlockBridge::LockHandler::ONLINE_SIGN_IN, |
+ const proximity_auth::mojom::AuthType existing_auth_type = |
+ screenlock_bridge_->lock_handler()->GetAuthType(account_id_); |
+ DCHECK_NE(proximity_auth::mojom::AuthType::ONLINE_SIGN_IN, |
existing_auth_type); |
if (state_ == ScreenlockState::AUTHENTICATED) { |
- if (existing_auth_type != |
- proximity_auth::ScreenlockBridge::LockHandler::USER_CLICK) { |
+ if (existing_auth_type != proximity_auth::mojom::AuthType::USER_CLICK) { |
screenlock_bridge_->lock_handler()->SetAuthType( |
- account_id_, |
- proximity_auth::ScreenlockBridge::LockHandler::USER_CLICK, |
+ account_id_, proximity_auth::mojom::AuthType::USER_CLICK, |
l10n_util::GetStringUTF16( |
IDS_EASY_UNLOCK_SCREENLOCK_USER_POD_AUTH_VALUE)); |
} |
} else if (existing_auth_type != |
- proximity_auth::ScreenlockBridge::LockHandler::OFFLINE_PASSWORD) { |
+ proximity_auth::mojom::AuthType::OFFLINE_PASSWORD) { |
screenlock_bridge_->lock_handler()->SetAuthType( |
- account_id_, |
- proximity_auth::ScreenlockBridge::LockHandler::OFFLINE_PASSWORD, |
+ account_id_, proximity_auth::mojom::AuthType::OFFLINE_PASSWORD, |
base::string16()); |
} |
} |