| Index: base/prefs/value_map_pref_store.h
|
| diff --git a/base/prefs/value_map_pref_store.h b/base/prefs/value_map_pref_store.h
|
| index badfef783e1f8e7c6586323ace799c6b8eeaed8b..eac785d4e2551d9a19b4edccaf6098c0c24c4c38 100644
|
| --- a/base/prefs/value_map_pref_store.h
|
| +++ b/base/prefs/value_map_pref_store.h
|
| @@ -5,10 +5,12 @@
|
| #ifndef BASE_PREFS_VALUE_MAP_PREF_STORE_H_
|
| #define BASE_PREFS_VALUE_MAP_PREF_STORE_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <map>
|
| #include <string>
|
|
|
| -#include "base/basictypes.h"
|
| +#include "base/macros.h"
|
| #include "base/observer_list.h"
|
| #include "base/prefs/base_prefs_export.h"
|
| #include "base/prefs/pref_value_map.h"
|
| @@ -30,13 +32,13 @@ class BASE_PREFS_EXPORT ValueMapPrefStore : public WriteablePrefStore {
|
| // WriteablePrefStore overrides:
|
| void SetValue(const std::string& key,
|
| scoped_ptr<base::Value> value,
|
| - uint32 flags) override;
|
| - void RemoveValue(const std::string& key, uint32 flags) override;
|
| + uint32_t flags) override;
|
| + void RemoveValue(const std::string& key, uint32_t flags) override;
|
| bool GetMutableValue(const std::string& key, base::Value** value) override;
|
| - void ReportValueChanged(const std::string& key, uint32 flags) override;
|
| + void ReportValueChanged(const std::string& key, uint32_t flags) override;
|
| void SetValueSilently(const std::string& key,
|
| scoped_ptr<base::Value> value,
|
| - uint32 flags) override;
|
| + uint32_t flags) override;
|
|
|
| protected:
|
| ~ValueMapPrefStore() override;
|
|
|