| Index: chrome/browser/signin/proximity_auth_facade.cc
|
| diff --git a/chrome/browser/signin/proximity_auth_facade.cc b/chrome/browser/signin/proximity_auth_facade.cc
|
| index bef11432ff50e1d4b97580820f0a1517ae330ed6..71de2e8c3f792a308daba7b7ea9de1d04dcfd92a 100644
|
| --- a/chrome/browser/signin/proximity_auth_facade.cc
|
| +++ b/chrome/browser/signin/proximity_auth_facade.cc
|
| @@ -5,46 +5,10 @@
|
| #include "chrome/browser/signin/proximity_auth_facade.h"
|
|
|
| #include "base/lazy_instance.h"
|
| -#include "base/logging.h"
|
| -#include "chrome/browser/profiles/profile.h"
|
| -#include "chrome/browser/profiles/profile_window.h"
|
| -#include "chrome/browser/signin/signin_manager_factory.h"
|
| -#include "components/proximity_auth/proximity_auth_client.h"
|
| #include "components/proximity_auth/screenlock_bridge.h"
|
| -#include "components/signin/core/browser/signin_manager_base.h"
|
|
|
| namespace {
|
|
|
| -// A Chrome-specific implementation of the ProximityAuthClient.
|
| -class ChromeProximityAuthClient : public proximity_auth::ProximityAuthClient {
|
| - public:
|
| - ChromeProximityAuthClient() {}
|
| - ~ChromeProximityAuthClient() override {}
|
| -
|
| - // proximity_auth::ProximityAuthClient implementation:
|
| - std::string GetAuthenticatedUsername(
|
| - content::BrowserContext* browser_context) const override;
|
| - void Lock(content::BrowserContext* browser_context) override;
|
| -
|
| - private:
|
| - DISALLOW_COPY_AND_ASSIGN(ChromeProximityAuthClient);
|
| -};
|
| -
|
| -std::string ChromeProximityAuthClient::GetAuthenticatedUsername(
|
| - content::BrowserContext* browser_context) const {
|
| - Profile* profile = Profile::FromBrowserContext(browser_context);
|
| - const SigninManagerBase* signin_manager =
|
| - SigninManagerFactory::GetForProfileIfExists(profile);
|
| - // |profile| has to be a signed-in profile with SigninManager already
|
| - // created. Otherwise, just crash to collect stack.
|
| - DCHECK(signin_manager);
|
| - return signin_manager->GetAuthenticatedUsername();
|
| -}
|
| -
|
| -void ChromeProximityAuthClient::Lock(content::BrowserContext* browser_context) {
|
| - profiles::LockProfile(Profile::FromBrowserContext(browser_context));
|
| -}
|
| -
|
| // A facade class that is the glue required to initialize and manage the
|
| // lifecycle of various objects of the Proximity Auth component.
|
| class ProximityAuthFacade {
|
| @@ -57,10 +21,9 @@ class ProximityAuthFacade {
|
| friend struct base::DefaultLazyInstanceTraits<ProximityAuthFacade>;
|
| friend struct base::DefaultDeleter<ProximityAuthFacade>;
|
|
|
| - ProximityAuthFacade() : screenlock_bridge_(&proximity_auth_client_) {}
|
| + ProximityAuthFacade() {}
|
| ~ProximityAuthFacade() {}
|
|
|
| - ChromeProximityAuthClient proximity_auth_client_;
|
| proximity_auth::ScreenlockBridge screenlock_bridge_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ProximityAuthFacade);
|
|
|