diff options
Diffstat (limited to 'chrome/browser/chromeos/policy')
16 files changed, 26 insertions, 18 deletions
diff --git a/chrome/browser/chromeos/policy/consumer_enrollment_handler_factory.cc b/chrome/browser/chromeos/policy/consumer_enrollment_handler_factory.cc index be40a02..93756c2 100644 --- a/chrome/browser/chromeos/policy/consumer_enrollment_handler_factory.cc +++ b/chrome/browser/chromeos/policy/consumer_enrollment_handler_factory.cc @@ -29,7 +29,7 @@ ConsumerEnrollmentHandlerFactory::GetForBrowserContext( // static ConsumerEnrollmentHandlerFactory* ConsumerEnrollmentHandlerFactory::GetInstance() { - return Singleton<ConsumerEnrollmentHandlerFactory>::get(); + return base::Singleton<ConsumerEnrollmentHandlerFactory>::get(); } ConsumerEnrollmentHandlerFactory::ConsumerEnrollmentHandlerFactory() diff --git a/chrome/browser/chromeos/policy/consumer_enrollment_handler_factory.h b/chrome/browser/chromeos/policy/consumer_enrollment_handler_factory.h index b615761..72436fde 100644 --- a/chrome/browser/chromeos/policy/consumer_enrollment_handler_factory.h +++ b/chrome/browser/chromeos/policy/consumer_enrollment_handler_factory.h @@ -28,7 +28,7 @@ class ConsumerEnrollmentHandlerFactory static ConsumerEnrollmentHandlerFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<ConsumerEnrollmentHandlerFactory>; + friend struct base::DefaultSingletonTraits<ConsumerEnrollmentHandlerFactory>; ConsumerEnrollmentHandlerFactory(); ~ConsumerEnrollmentHandlerFactory() override; diff --git a/chrome/browser/chromeos/policy/consumer_management_notifier_factory.cc b/chrome/browser/chromeos/policy/consumer_management_notifier_factory.cc index a63c772..1df6863 100644 --- a/chrome/browser/chromeos/policy/consumer_management_notifier_factory.cc +++ b/chrome/browser/chromeos/policy/consumer_management_notifier_factory.cc @@ -26,7 +26,7 @@ ConsumerManagementNotifierFactory::GetForBrowserContext( // static ConsumerManagementNotifierFactory* ConsumerManagementNotifierFactory::GetInstance() { - return Singleton<ConsumerManagementNotifierFactory>::get(); + return base::Singleton<ConsumerManagementNotifierFactory>::get(); } ConsumerManagementNotifierFactory::ConsumerManagementNotifierFactory() diff --git a/chrome/browser/chromeos/policy/consumer_management_notifier_factory.h b/chrome/browser/chromeos/policy/consumer_management_notifier_factory.h index ae5c934..f8e935a 100644 --- a/chrome/browser/chromeos/policy/consumer_management_notifier_factory.h +++ b/chrome/browser/chromeos/policy/consumer_management_notifier_factory.h @@ -26,7 +26,7 @@ class ConsumerManagementNotifierFactory static ConsumerManagementNotifierFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<ConsumerManagementNotifierFactory>; + friend struct base::DefaultSingletonTraits<ConsumerManagementNotifierFactory>; ConsumerManagementNotifierFactory(); ~ConsumerManagementNotifierFactory() override; diff --git a/chrome/browser/chromeos/policy/consumer_unenrollment_handler_factory.cc b/chrome/browser/chromeos/policy/consumer_unenrollment_handler_factory.cc index b44377e..f062203 100644 --- a/chrome/browser/chromeos/policy/consumer_unenrollment_handler_factory.cc +++ b/chrome/browser/chromeos/policy/consumer_unenrollment_handler_factory.cc @@ -25,7 +25,7 @@ ConsumerUnenrollmentHandlerFactory::GetForBrowserContext( // static ConsumerUnenrollmentHandlerFactory* ConsumerUnenrollmentHandlerFactory::GetInstance() { - return Singleton<ConsumerUnenrollmentHandlerFactory>::get(); + return base::Singleton<ConsumerUnenrollmentHandlerFactory>::get(); } ConsumerUnenrollmentHandlerFactory::ConsumerUnenrollmentHandlerFactory() diff --git a/chrome/browser/chromeos/policy/consumer_unenrollment_handler_factory.h b/chrome/browser/chromeos/policy/consumer_unenrollment_handler_factory.h index 77b11bb..c706eb3 100644 --- a/chrome/browser/chromeos/policy/consumer_unenrollment_handler_factory.h +++ b/chrome/browser/chromeos/policy/consumer_unenrollment_handler_factory.h @@ -22,7 +22,8 @@ class ConsumerUnenrollmentHandlerFactory static ConsumerUnenrollmentHandlerFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<ConsumerUnenrollmentHandlerFactory>; + friend struct base::DefaultSingletonTraits< + ConsumerUnenrollmentHandlerFactory>; ConsumerUnenrollmentHandlerFactory(); ~ConsumerUnenrollmentHandlerFactory() override; diff --git a/chrome/browser/chromeos/policy/policy_cert_service_factory.cc b/chrome/browser/chromeos/policy/policy_cert_service_factory.cc index 52a69f3..9b999a9 100644 --- a/chrome/browser/chromeos/policy/policy_cert_service_factory.cc +++ b/chrome/browser/chromeos/policy/policy_cert_service_factory.cc @@ -42,7 +42,7 @@ scoped_ptr<PolicyCertVerifier> PolicyCertServiceFactory::CreateForProfile( // static PolicyCertServiceFactory* PolicyCertServiceFactory::GetInstance() { - return Singleton<PolicyCertServiceFactory>::get(); + return base::Singleton<PolicyCertServiceFactory>::get(); } // static diff --git a/chrome/browser/chromeos/policy/policy_cert_service_factory.h b/chrome/browser/chromeos/policy/policy_cert_service_factory.h index b2851ba..5d5b74b 100644 --- a/chrome/browser/chromeos/policy/policy_cert_service_factory.h +++ b/chrome/browser/chromeos/policy/policy_cert_service_factory.h @@ -12,7 +12,10 @@ #include "base/memory/scoped_ptr.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" -template <typename T> struct DefaultSingletonTraits; +namespace base { +template <typename T> +struct DefaultSingletonTraits; +} // namespace base class PrefRegistrySimple; class Profile; @@ -49,7 +52,7 @@ class PolicyCertServiceFactory : public BrowserContextKeyedServiceFactory { static void RegisterPrefs(PrefRegistrySimple* local_state); private: - friend struct DefaultSingletonTraits<PolicyCertServiceFactory>; + friend struct base::DefaultSingletonTraits<PolicyCertServiceFactory>; PolicyCertServiceFactory(); ~PolicyCertServiceFactory() override; diff --git a/chrome/browser/chromeos/policy/recommendation_restorer_factory.cc b/chrome/browser/chromeos/policy/recommendation_restorer_factory.cc index 23961aa..0c791df 100644 --- a/chrome/browser/chromeos/policy/recommendation_restorer_factory.cc +++ b/chrome/browser/chromeos/policy/recommendation_restorer_factory.cc @@ -13,7 +13,7 @@ namespace policy { // static RecommendationRestorerFactory* RecommendationRestorerFactory::GetInstance() { - return Singleton<RecommendationRestorerFactory>::get(); + return base::Singleton<RecommendationRestorerFactory>::get(); } // static diff --git a/chrome/browser/chromeos/policy/recommendation_restorer_factory.h b/chrome/browser/chromeos/policy/recommendation_restorer_factory.h index fdf7dfa..a683c4a 100644 --- a/chrome/browser/chromeos/policy/recommendation_restorer_factory.h +++ b/chrome/browser/chromeos/policy/recommendation_restorer_factory.h @@ -29,7 +29,7 @@ class RecommendationRestorerFactory : public BrowserContextKeyedServiceFactory { bool ServiceIsCreatedWithBrowserContext() const override; private: - friend struct DefaultSingletonTraits<RecommendationRestorerFactory>; + friend struct base::DefaultSingletonTraits<RecommendationRestorerFactory>; RecommendationRestorerFactory(); ~RecommendationRestorerFactory() override; diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc index 65da55c..d18bed6 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc +++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc @@ -73,7 +73,7 @@ const int kInitialPolicyFetchTimeoutSeconds = 10; // static UserCloudPolicyManagerFactoryChromeOS* UserCloudPolicyManagerFactoryChromeOS::GetInstance() { - return Singleton<UserCloudPolicyManagerFactoryChromeOS>::get(); + return base::Singleton<UserCloudPolicyManagerFactoryChromeOS>::get(); } // static diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h index 1762cc6..d018515 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h +++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h @@ -62,7 +62,8 @@ class UserCloudPolicyManagerFactoryChromeOS scoped_refptr<base::SequencedTaskRunner> background_task_runner); private: - friend struct DefaultSingletonTraits<UserCloudPolicyManagerFactoryChromeOS>; + friend struct base::DefaultSingletonTraits< + UserCloudPolicyManagerFactoryChromeOS>; UserCloudPolicyManagerFactoryChromeOS(); ~UserCloudPolicyManagerFactoryChromeOS() override; diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.cc b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.cc index 0d498c6..731b269 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.cc +++ b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.cc @@ -19,7 +19,7 @@ namespace policy { // static UserCloudPolicyTokenForwarderFactory* UserCloudPolicyTokenForwarderFactory::GetInstance() { - return Singleton<UserCloudPolicyTokenForwarderFactory>::get(); + return base::Singleton<UserCloudPolicyTokenForwarderFactory>::get(); } UserCloudPolicyTokenForwarderFactory::UserCloudPolicyTokenForwarderFactory() diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.h b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.h index c34cb2e..53f5d8b 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.h +++ b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.h @@ -24,7 +24,8 @@ class UserCloudPolicyTokenForwarderFactory static UserCloudPolicyTokenForwarderFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<UserCloudPolicyTokenForwarderFactory>; + friend struct base::DefaultSingletonTraits< + UserCloudPolicyTokenForwarderFactory>; UserCloudPolicyTokenForwarderFactory(); ~UserCloudPolicyTokenForwarderFactory() override; diff --git a/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc b/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc index 9d66ff0..e13ed61 100644 --- a/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc +++ b/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc @@ -29,7 +29,7 @@ UserNetworkConfigurationUpdaterFactory::GetForProfile(Profile* profile) { // static UserNetworkConfigurationUpdaterFactory* UserNetworkConfigurationUpdaterFactory::GetInstance() { - return Singleton<UserNetworkConfigurationUpdaterFactory>::get(); + return base::Singleton<UserNetworkConfigurationUpdaterFactory>::get(); } UserNetworkConfigurationUpdaterFactory::UserNetworkConfigurationUpdaterFactory() diff --git a/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.h b/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.h index 13866a8..d91dcab 100644 --- a/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.h +++ b/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.h @@ -9,9 +9,10 @@ #include "base/compiler_specific.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" +namespace base { template <typename T> struct DefaultSingletonTraits; - +} // namespace base class Profile; namespace policy { @@ -30,7 +31,8 @@ class UserNetworkConfigurationUpdaterFactory static UserNetworkConfigurationUpdaterFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<UserNetworkConfigurationUpdaterFactory>; + friend struct base::DefaultSingletonTraits< + UserNetworkConfigurationUpdaterFactory>; UserNetworkConfigurationUpdaterFactory(); ~UserNetworkConfigurationUpdaterFactory() override; |