Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(906)

Unified Diff: chrome/browser/chromeos/ownership/owner_settings_service.h

Issue 419013003: Replace c/b/nss_context by a KeyedService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added Linux implementation. Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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;

Powered by Google App Engine
This is Rietveld 408576698