| Index: third_party/libaddressinput/chromium/chrome_storage_impl.cc
|
| diff --git a/third_party/libaddressinput/chromium/chrome_storage_impl.cc b/third_party/libaddressinput/chromium/chrome_storage_impl.cc
|
| index 2cd8c01d9aec63a72cd7c63025e9cb9ac9aa0811..d3128abee12892c7b0659460121bd76339f0d949 100644
|
| --- a/third_party/libaddressinput/chromium/chrome_storage_impl.cc
|
| +++ b/third_party/libaddressinput/chromium/chrome_storage_impl.cc
|
| @@ -7,6 +7,8 @@
|
| #include "base/prefs/writeable_pref_store.h"
|
| #include "base/values.h"
|
|
|
| +namespace autofill {
|
| +
|
| ChromeStorageImpl::ChromeStorageImpl(WriteablePrefStore* store)
|
| : backing_store_(store),
|
| scoped_observer_(this) {
|
| @@ -21,25 +23,6 @@ void ChromeStorageImpl::Put(const std::string& key, const std::string& data) {
|
|
|
| void ChromeStorageImpl::Get(
|
| const std::string& key,
|
| - scoped_ptr<Storage::Callback> data_ready) const {
|
| - // |Get()| should not be const, so this is just a thunk that fixes that.
|
| - const_cast<ChromeStorageImpl*>(this)->DoGet(key, data_ready.Pass());
|
| -}
|
| -
|
| -void ChromeStorageImpl::OnPrefValueChanged(const std::string& key) {}
|
| -
|
| -void ChromeStorageImpl::OnInitializationCompleted(bool succeeded) {
|
| - for (std::vector<Request*>::iterator iter =
|
| - outstanding_requests_.begin();
|
| - iter != outstanding_requests_.end(); ++iter) {
|
| - DoGet((*iter)->key, (*iter)->callback.Pass());
|
| - }
|
| -
|
| - outstanding_requests_.clear();
|
| -}
|
| -
|
| -void ChromeStorageImpl::DoGet(
|
| - const std::string& key,
|
| scoped_ptr<Storage::Callback> data_ready) {
|
| if (!backing_store_->IsInitializationComplete()) {
|
| outstanding_requests_.push_back(
|
| @@ -57,7 +40,21 @@ void ChromeStorageImpl::DoGet(
|
| }
|
| }
|
|
|
| +void ChromeStorageImpl::OnPrefValueChanged(const std::string& key) {}
|
| +
|
| +void ChromeStorageImpl::OnInitializationCompleted(bool succeeded) {
|
| + for (std::vector<Request*>::iterator iter =
|
| + outstanding_requests_.begin();
|
| + iter != outstanding_requests_.end(); ++iter) {
|
| + Get((*iter)->key, (*iter)->callback.Pass());
|
| + }
|
| +
|
| + outstanding_requests_.clear();
|
| +}
|
| +
|
| ChromeStorageImpl::Request::Request(const std::string& key,
|
| scoped_ptr<Storage::Callback> callback)
|
| : key(key),
|
| callback(callback.Pass()) {}
|
| +
|
| +} // namespace autofill
|
|
|