| Index: chrome/browser/chromeos/settings/cros_settings.h
|
| diff --git a/chrome/browser/chromeos/settings/cros_settings.h b/chrome/browser/chromeos/settings/cros_settings.h
|
| index adeb416adac238ccea0fa510ce1fb0851b44aeae..77d5c1dae2d5fb70f9c5d0075fe065786ba1e793 100644
|
| --- a/chrome/browser/chromeos/settings/cros_settings.h
|
| +++ b/chrome/browser/chromeos/settings/cros_settings.h
|
| @@ -13,7 +13,7 @@
|
| #include "base/callback_list.h"
|
| #include "base/containers/hash_tables.h"
|
| #include "base/macros.h"
|
| -#include "base/threading/non_thread_safe.h"
|
| +#include "base/sequence_checker.h"
|
| #include "chromeos/settings/cros_settings_names.h"
|
| #include "chromeos/settings/cros_settings_provider.h"
|
|
|
| @@ -28,7 +28,7 @@ namespace chromeos {
|
| class DeviceSettingsService;
|
|
|
| // This class manages per-device/global settings.
|
| -class CrosSettings : public base::NonThreadSafe {
|
| +class CrosSettings {
|
| public:
|
| // Manage singleton instance.
|
| static void Initialize();
|
| @@ -134,6 +134,8 @@ class CrosSettings : public base::NonThreadSafe {
|
| base::hash_map<std::string, std::unique_ptr<base::CallbackList<void(void)>>>
|
| settings_observers_;
|
|
|
| + SEQUENCE_CHECKER(sequence_checker_);
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(CrosSettings);
|
| };
|
|
|
|
|