| Index: chrome/browser/policy/cloud_policy_data_store.h
|
| diff --git a/chrome/browser/policy/cloud_policy_data_store.h b/chrome/browser/policy/cloud_policy_data_store.h
|
| index 47942a9f43b3395829aa75b2f404f40e9e81f75a..34ecae71c2e1248cca2152cedd4461121593f10e 100644
|
| --- a/chrome/browser/policy/cloud_policy_data_store.h
|
| +++ b/chrome/browser/policy/cloud_policy_data_store.h
|
| @@ -38,15 +38,6 @@ class CloudPolicyDataStore {
|
| virtual void OnCredentialsChanged() = 0;
|
| };
|
|
|
| - // Describes the affilitation of a user w.r.t. the managed state of the
|
| - // device.
|
| - enum UserAffiliation {
|
| - // User is on the same domain the device was registered with.
|
| - USER_AFFILIATION_MANAGED,
|
| - // No affiliation between device and user user.
|
| - USER_AFFILIATION_NONE,
|
| - };
|
| -
|
| ~CloudPolicyDataStore();
|
|
|
| // Create CloudPolicyData with constants initialized for fetching user
|
| @@ -83,7 +74,7 @@ class CloudPolicyDataStore {
|
| void set_machine_id(const std::string& machine_id);
|
| void set_machine_model(const std::string& machine_model);
|
| void set_user_name(const std::string& user_name);
|
| - void set_user_affiliation(policy::UserAffiliation user_affiliation);
|
| + void set_user_affiliation(UserAffiliation user_affiliation);
|
|
|
| #if defined(OS_CHROMEOS)
|
| void set_device_status_collector(DeviceStatusCollector* collector);
|
| @@ -102,7 +93,7 @@ class CloudPolicyDataStore {
|
| const std::string& policy_type() const;
|
| bool token_cache_loaded() const;
|
| const std::string& user_name() const;
|
| - policy::UserAffiliation user_affiliation() const;
|
| + UserAffiliation user_affiliation() const;
|
|
|
| void AddObserver(Observer* observer);
|
| void RemoveObserver(Observer* observer);
|
| @@ -122,7 +113,7 @@ class CloudPolicyDataStore {
|
|
|
| // Data necessary for constructing policy requests.
|
| std::string device_token_;
|
| - policy::UserAffiliation user_affiliation_;
|
| + UserAffiliation user_affiliation_;
|
|
|
| // Constants that won't change over the life-time of a cloud policy
|
| // subsystem.
|
|
|