Index: chrome/browser/chromeos/settings/device_settings_service.h |
diff --git a/chrome/browser/chromeos/settings/device_settings_service.h b/chrome/browser/chromeos/settings/device_settings_service.h |
index 1a66fd7e6d398d1b3acdb62e3a3050f514bd1ad3..b514037ad74e168ab5fe99c0b03e6d5383a887e9 100644 |
--- a/chrome/browser/chromeos/settings/device_settings_service.h |
+++ b/chrome/browser/chromeos/settings/device_settings_service.h |
@@ -25,10 +25,13 @@ namespace crypto { |
class RSAPrivateKey; |
} |
-namespace chromeos { |
- |
+namespace ownership { |
class OwnerKeyUtil; |
class PublicKey; |
+} |
+ |
+namespace chromeos { |
+ |
class SessionManagerOperation; |
// Deals with the low-level interface to Chromium OS device settings. Device |
@@ -134,7 +137,7 @@ class DeviceSettingsService : public SessionManagerClient::Observer { |
// To be called on startup once threads are initialized and DBus is ready. |
void SetSessionManager(SessionManagerClient* session_manager_client, |
- scoped_refptr<OwnerKeyUtil> owner_key_util); |
+ scoped_refptr<ownership::OwnerKeyUtil> owner_key_util); |
// Prevents the service from making further calls to session_manager_client |
// and stops any pending operations. |
@@ -155,7 +158,7 @@ class DeviceSettingsService : public SessionManagerClient::Observer { |
} |
// Returns the currently used owner key. |
- scoped_refptr<PublicKey> GetPublicKey(); |
+ scoped_refptr<ownership::PublicKey> GetPublicKey(); |
// Returns the status generated by the last operation. |
Status status() { |
@@ -254,14 +257,14 @@ class DeviceSettingsService : public SessionManagerClient::Observer { |
} |
SessionManagerClient* session_manager_client_; |
- scoped_refptr<OwnerKeyUtil> owner_key_util_; |
+ scoped_refptr<ownership::OwnerKeyUtil> owner_key_util_; |
Status store_status_; |
std::vector<OwnershipStatusCallback> pending_ownership_status_callbacks_; |
std::string username_; |
- scoped_refptr<PublicKey> public_key_; |
+ scoped_refptr<ownership::PublicKey> public_key_; |
base::WeakPtr<PrivateKeyDelegate> delegate_; |
scoped_ptr<enterprise_management::PolicyData> policy_data_; |