| Index: third_party/libaddressinput/chromium/chrome_storage_impl.h
|
| diff --git a/third_party/libaddressinput/chromium/chrome_storage_impl.h b/third_party/libaddressinput/chromium/chrome_storage_impl.h
|
| index 11da9486eae728975e3c142ea7e0ec1007494fdc..d20999d9f5d4a3cf43fb7ef6b58a1f90c8be774a 100644
|
| --- a/third_party/libaddressinput/chromium/chrome_storage_impl.h
|
| +++ b/third_party/libaddressinput/chromium/chrome_storage_impl.h
|
| @@ -16,19 +16,21 @@
|
|
|
| class WriteablePrefStore;
|
|
|
| +namespace autofill {
|
| +
|
| // An implementation of the Storage interface which passes through to an
|
| // underlying WriteablePrefStore.
|
| -class ChromeStorageImpl : public i18n::addressinput::Storage,
|
| +class ChromeStorageImpl : public ::i18n::addressinput::Storage,
|
| public PrefStore::Observer {
|
| public:
|
| // |store| must outlive |this|.
|
| explicit ChromeStorageImpl(WriteablePrefStore* store);
|
| virtual ~ChromeStorageImpl();
|
|
|
| - // i18n::addressinput::Storage implementation.
|
| + // ::i18n::addressinput::Storage implementation.
|
| virtual void Put(const std::string& key, const std::string& data) OVERRIDE;
|
| virtual void Get(const std::string& key, scoped_ptr<Callback> data_ready)
|
| - const OVERRIDE;
|
| + OVERRIDE;
|
|
|
| // PrefStore::Observer implementation.
|
| virtual void OnPrefValueChanged(const std::string& key) OVERRIDE;
|
| @@ -42,9 +44,6 @@ class ChromeStorageImpl : public i18n::addressinput::Storage,
|
| scoped_ptr<Callback> callback;
|
| };
|
|
|
| - // Non-const version of Get().
|
| - void DoGet(const std::string& key, scoped_ptr<Callback> data_ready);
|
| -
|
| WriteablePrefStore* backing_store_; // weak
|
|
|
| // Get requests that haven't yet been serviced.
|
| @@ -55,4 +54,6 @@ class ChromeStorageImpl : public i18n::addressinput::Storage,
|
| DISALLOW_COPY_AND_ASSIGN(ChromeStorageImpl);
|
| };
|
|
|
| +} // namespace autofill
|
| +
|
| #endif // THIRD_PARTY_LIBADDRESSINPUT_CHROMIUM_CHROME_STORAGE_IMPL_H_
|
|
|