Chromium Code Reviews| Index: chrome/browser/signin/easy_unlock_service_regular.cc |
| diff --git a/chrome/browser/signin/easy_unlock_service_regular.cc b/chrome/browser/signin/easy_unlock_service_regular.cc |
| index a7f8ea9568613448e73a1a1a5fbbb29121bfd9ab..8e4c37e786b74ea8d4f4f1d682eccb3a9ccd3164 100644 |
| --- a/chrome/browser/signin/easy_unlock_service_regular.cc |
| +++ b/chrome/browser/signin/easy_unlock_service_regular.cc |
| @@ -14,7 +14,6 @@ |
| #include "chrome/browser/browser_process.h" |
| #include "chrome/browser/profiles/profile.h" |
| #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" |
| -#include "chrome/browser/signin/screenlock_bridge.h" |
| #include "chrome/browser/signin/signin_manager_factory.h" |
| #include "chrome/common/chrome_version_info.h" |
| #include "chrome/common/extensions/api/easy_unlock_private.h" |
| @@ -25,6 +24,7 @@ |
| #include "components/proximity_auth/cryptauth/cryptauth_access_token_fetcher.h" |
| #include "components/proximity_auth/cryptauth/cryptauth_client_impl.h" |
| #include "components/proximity_auth/switches.h" |
| +#include "components/signin/content/screenlock_bridge.h" |
| #include "components/signin/core/browser/profile_oauth2_token_service.h" |
| #include "components/signin/core/browser/signin_manager.h" |
| #include "content/public/browser/browser_thread.h" |
| @@ -92,7 +92,8 @@ EasyUnlockService::Type EasyUnlockServiceRegular::GetType() const { |
| } |
| std::string EasyUnlockServiceRegular::GetUserEmail() const { |
| - return ScreenlockBridge::GetAuthenticatedUserEmail(profile()); |
| + return SigninManagerFactory::GetForProfileIfExists(profile()) |
| + ->GetAuthenticatedUsername(); |
|
Ilya Sherman
2015/04/21 23:02:39
Please keep the comment from screenlock_bridge.cc
msarda
2015/04/22 16:42:42
Done.
|
| } |
| void EasyUnlockServiceRegular::LaunchSetup() { |