Index: chrome/browser/chromeos/ownership/owner_settings_service.h |
diff --git a/chrome/browser/chromeos/ownership/owner_settings_service.h b/chrome/browser/chromeos/ownership/owner_settings_service.h |
index 32a8f953bfe5e623bfa1511041ffd02066760277..c3f4195fd73518cec2a7db88afc496450484673d 100644 |
--- a/chrome/browser/chromeos/ownership/owner_settings_service.h |
+++ b/chrome/browser/chromeos/ownership/owner_settings_service.h |
@@ -15,7 +15,6 @@ |
#include "base/threading/thread_checker.h" |
#include "chrome/browser/chromeos/settings/device_settings_service.h" |
#include "chromeos/dbus/session_manager_client.h" |
-#include "chromeos/tpm_token_loader.h" |
#include "components/keyed_service/core/keyed_service.h" |
#include "components/ownership/owner_key_util.h" |
#include "content/public/browser/notification_observer.h" |
@@ -34,7 +33,6 @@ class SessionManagerOperation; |
class OwnerSettingsService : public DeviceSettingsService::PrivateKeyDelegate, |
public KeyedService, |
public content::NotificationObserver, |
- public TPMTokenLoader::Observer, |
public SessionManagerClient::Observer { |
public: |
virtual ~OwnerSettingsService(); |
@@ -43,6 +41,8 @@ class OwnerSettingsService : public DeviceSettingsService::PrivateKeyDelegate, |
return weak_factory_.GetWeakPtr(); |
} |
+ void OnTPMTokenReady(bool tpm_token_enabled); |
+ |
// DeviceSettingsService::PrivateKeyDelegate implementation: |
virtual bool IsOwner() OVERRIDE; |
virtual void IsOwnerAsync(const IsOwnerCallback& callback) OVERRIDE; |
@@ -63,9 +63,6 @@ class OwnerSettingsService : public DeviceSettingsService::PrivateKeyDelegate, |
const content::NotificationSource& source, |
const content::NotificationDetails& details) OVERRIDE; |
- // TPMTokenLoader::Observer: |
- virtual void OnTPMTokenReady() OVERRIDE; |
- |
// SessionManagerClient::Observer: |
virtual void OwnerKeySet(bool success) OVERRIDE; |