| Index: chrome/browser/signin/easy_unlock_service.h
|
| diff --git a/chrome/browser/signin/easy_unlock_service.h b/chrome/browser/signin/easy_unlock_service.h
|
| index c2dfee5302ac1be1e88fe4fe1ad36cb1a6e51d55..4f6d6ad879dc53402eb1a67d007e16340a2283ac 100644
|
| --- a/chrome/browser/signin/easy_unlock_service.h
|
| +++ b/chrome/browser/signin/easy_unlock_service.h
|
| @@ -19,7 +19,6 @@
|
| #include "chrome/browser/signin/easy_unlock_screenlock_state_handler.h"
|
| #include "components/keyed_service/core/keyed_service.h"
|
| #include "components/proximity_auth/screenlock_state.h"
|
| -#include "components/proximity_auth/webui/proximity_auth_ui_delegate.h"
|
|
|
| #if defined(OS_CHROMEOS)
|
| #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_types.h"
|
| @@ -47,8 +46,7 @@ class EasyUnlockServiceObserver;
|
| class Profile;
|
| class PrefRegistrySimple;
|
|
|
| -class EasyUnlockService : public KeyedService,
|
| - public proximity_auth::ProximityAuthUIDelegate {
|
| +class EasyUnlockService : public KeyedService {
|
| public:
|
| enum TurnOffFlowStatus {
|
| IDLE,
|
| @@ -221,16 +219,6 @@ class EasyUnlockService : public KeyedService,
|
| void AddObserver(EasyUnlockServiceObserver* observer);
|
| void RemoveObserver(EasyUnlockServiceObserver* observer);
|
|
|
| - // ProximityAuthUIDelegate:
|
| - PrefService* GetPrefService() override;
|
| - scoped_ptr<proximity_auth::SecureMessageDelegate>
|
| - CreateSecureMessageDelegate() override;
|
| - scoped_ptr<proximity_auth::CryptAuthClientFactory>
|
| - CreateCryptAuthClientFactory() override;
|
| - cryptauth::DeviceClassifier GetDeviceClassifier() override;
|
| - std::string GetAccountId() override;
|
| - gcm::GCMDriver* GetGCMDriver() override;
|
| -
|
| ChromeProximityAuthClient* proximity_auth_client() {
|
| return &proximity_auth_client_;
|
| }
|
|
|