| Index: chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h
|
| diff --git a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h
|
| index db6cfc9990552d987c9dd6356ff2bab222b46e6d..fe342d8ccbe18ee9199f39d6292c5282e82d38b5 100644
|
| --- a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h
|
| +++ b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h
|
| @@ -5,14 +5,12 @@
|
| #ifndef CHROME_BROWSER_CHROMEOS_POLICY_BROWSER_POLICY_CONNECTOR_CHROMEOS_H_
|
| #define CHROME_BROWSER_CHROMEOS_POLICY_BROWSER_POLICY_CONNECTOR_CHROMEOS_H_
|
|
|
| -#include <set>
|
| #include <string>
|
|
|
| #include "base/basictypes.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| -#include "chrome/browser/chromeos/login/users/affiliation.h"
|
| #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
|
| #include "chrome/browser/policy/chrome_browser_policy_connector.h"
|
| #include "components/policy/core/common/cloud/cloud_policy_constants.h"
|
| @@ -65,7 +63,7 @@
|
| bool IsEnterpriseManaged();
|
|
|
| // Returns the enterprise domain if device is managed.
|
| - std::string GetEnterpriseDomain() const;
|
| + std::string GetEnterpriseDomain();
|
|
|
| // Returns the device asset ID if it is set.
|
| std::string GetDeviceAssetID();
|
| @@ -146,8 +144,6 @@
|
| void OnDeviceCloudPolicyManagerConnected() override;
|
| void OnDeviceCloudPolicyManagerDisconnected() override;
|
|
|
| - chromeos::AffiliationIDSet GetDeviceAffiliationIDs() const;
|
| -
|
| private:
|
| // Set the timezone as soon as the policies are available.
|
| void SetTimezoneIfPolicyAvailable();
|
|
|