Index: chrome/browser/signin/easy_unlock_auth_attempt.cc |
diff --git a/chrome/browser/signin/easy_unlock_auth_attempt.cc b/chrome/browser/signin/easy_unlock_auth_attempt.cc |
index 49b6951338858977598c164c611e5faa47590962..98da4ea29969d3892df7b8f6a32c4acaaf1df5a7 100644 |
--- a/chrome/browser/signin/easy_unlock_auth_attempt.cc |
+++ b/chrome/browser/signin/easy_unlock_auth_attempt.cc |
@@ -7,7 +7,7 @@ |
#include "base/logging.h" |
#include "chrome/browser/extensions/api/screenlock_private/screenlock_private_api.h" |
#include "chrome/browser/profiles/profile.h" |
-#include "chrome/browser/signin/screenlock_bridge.h" |
+#include "chrome/browser/signin/signin_screen_bridge.h" |
#include "crypto/encryptor.h" |
#include "crypto/symmetric_key.h" |
@@ -67,7 +67,7 @@ EasyUnlockAuthAttempt::~EasyUnlockAuthAttempt() { |
bool EasyUnlockAuthAttempt::Start(const std::string& user_id) { |
DCHECK(state_ == STATE_IDLE); |
- if (!ScreenlockBridge::Get()->IsLocked()) |
+ if (!SigninScreenBridge::Get()->IsLocked()) |
return false; |
if (user_id != user_id_) { |
@@ -75,10 +75,10 @@ bool EasyUnlockAuthAttempt::Start(const std::string& user_id) { |
return false; |
} |
- ScreenlockBridge::LockHandler::AuthType auth_type = |
- ScreenlockBridge::Get()->lock_handler()->GetAuthType(user_id); |
+ SigninScreenBridge::LockHandler::AuthType auth_type = |
+ SigninScreenBridge::Get()->lock_handler()->GetAuthType(user_id); |
- if (auth_type != ScreenlockBridge::LockHandler::USER_CLICK) { |
+ if (auth_type != SigninScreenBridge::LockHandler::USER_CLICK) { |
Cancel(user_id); |
return false; |
} |
@@ -104,13 +104,13 @@ void EasyUnlockAuthAttempt::FinalizeUnlock(const std::string& user_id, |
return; |
} |
- if (!ScreenlockBridge::Get()->IsLocked()) |
+ if (!SigninScreenBridge::Get()->IsLocked()) |
return; |
if (success) { |
- ScreenlockBridge::Get()->lock_handler()->Unlock(user_id_); |
+ SigninScreenBridge::Get()->lock_handler()->Unlock(user_id_); |
} else { |
- ScreenlockBridge::Get()->lock_handler()->EnableInput(); |
+ SigninScreenBridge::Get()->lock_handler()->EnableInput(); |
} |
state_ = STATE_DONE; |
@@ -127,7 +127,7 @@ void EasyUnlockAuthAttempt::FinalizeSignin(const std::string& user_id, |
return; |
} |
- if (!ScreenlockBridge::Get()->IsLocked()) |
+ if (!SigninScreenBridge::Get()->IsLocked()) |
return; |
@@ -144,7 +144,7 @@ void EasyUnlockAuthAttempt::FinalizeSignin(const std::string& user_id, |
key_label = chromeos::EasyUnlockKeyManager::GetKeyLabel(0u); |
#endif // defined(OS_CHROMEOS) |
- ScreenlockBridge::Get()->lock_handler()->AttemptUserClickLogin( |
+ SigninScreenBridge::Get()->lock_handler()->AttemptUserClickLogin( |
user_id, |
unwrapped_secret, |
key_label); |