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 23f64dd78f81d08dd1036e87442c438f78e9cc6b..c7f09a9eac73259050c1f89bc3bc2c00743f8bd7 100644 |
--- a/chrome/browser/chromeos/ownership/owner_settings_service.h |
+++ b/chrome/browser/chromeos/ownership/owner_settings_service.h |
@@ -52,9 +52,11 @@ class OwnerSettingsService : public DeviceSettingsService::PrivateKeyDelegate, |
// TPMTokenLoader::Observer: |
virtual void OnTPMTokenReady() OVERRIDE; |
- // Checks whether NSS slots with private key are mounted or |
- // not. Responds via |callback|. |
- static void IsPrivateKeyExistAsync(const IsOwnerCallback& callback); |
+ // Checks if the user is the device owner, without the user profile having to |
+ // been initialized. Should be used only if login state is in safe mode. |
+ static void IsOwnerForSafeModeAsync(const std::string& user_id, |
+ const std::string& user_hash, |
+ const IsOwnerCallback& callback); |
static void SetOwnerKeyUtilForTesting( |
const scoped_refptr<OwnerKeyUtil>& owner_key_util); |
@@ -67,6 +69,10 @@ class OwnerSettingsService : public DeviceSettingsService::PrivateKeyDelegate, |
explicit OwnerSettingsService(Profile* profile); |
+ // Checks whether NSS slots with private key are mounted or |
+ // not. Responds via |callback|. |
+ static void IsPrivateKeyExistAsync(const IsOwnerCallback& callback); |
Ryan Sleevi
2014/07/01 18:51:33
If this is a static method, can't you really just
tbarzic
2014/07/01 23:55:03
no valid reason; moved to .cc
|
+ |
// Reloads private key from profile's NSS slots. Responds via call |
// to OnPrivateKeyLoaded(). |
void ReloadPrivateKey(); |