| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/extensions/api/storage/syncable_settings_storage.h" | 5 #include "chrome/browser/extensions/api/storage/syncable_settings_storage.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
| 10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
| 11 #include "chrome/browser/extensions/api/storage/settings_sync_processor.h" | 11 #include "chrome/browser/extensions/api/storage/settings_sync_processor.h" |
| 12 #include "chrome/browser/extensions/api/storage/settings_sync_util.h" | 12 #include "chrome/browser/extensions/api/storage/settings_sync_util.h" |
| 13 #include "components/sync/api/sync_data.h" | 13 #include "components/sync/model/sync_data.h" |
| 14 #include "components/sync/protocol/extension_setting_specifics.pb.h" | 14 #include "components/sync/protocol/extension_setting_specifics.pb.h" |
| 15 #include "content/public/browser/browser_thread.h" | 15 #include "content/public/browser/browser_thread.h" |
| 16 #include "extensions/browser/api/storage/settings_namespace.h" | 16 #include "extensions/browser/api/storage/settings_namespace.h" |
| 17 | 17 |
| 18 using content::BrowserThread; | 18 using content::BrowserThread; |
| 19 | 19 |
| 20 namespace extensions { | 20 namespace extensions { |
| 21 | 21 |
| 22 SyncableSettingsStorage::SyncableSettingsStorage( | 22 SyncableSettingsStorage::SyncableSettingsStorage( |
| 23 const scoped_refptr<base::ObserverListThreadSafe<SettingsObserver>>& | 23 const scoped_refptr<base::ObserverListThreadSafe<SettingsObserver>>& |
| (...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 397 FROM_HERE, syncer::SyncError::DATATYPE_ERROR, | 397 FROM_HERE, syncer::SyncError::DATATYPE_ERROR, |
| 398 base::StringPrintf("Error pushing sync remove to local settings: %s", | 398 base::StringPrintf("Error pushing sync remove to local settings: %s", |
| 399 result->status().message.c_str()), | 399 result->status().message.c_str()), |
| 400 sync_processor_->type()); | 400 sync_processor_->type()); |
| 401 } | 401 } |
| 402 changes->push_back(ValueStoreChange(key, std::move(old_value), nullptr)); | 402 changes->push_back(ValueStoreChange(key, std::move(old_value), nullptr)); |
| 403 return syncer::SyncError(); | 403 return syncer::SyncError(); |
| 404 } | 404 } |
| 405 | 405 |
| 406 } // namespace extensions | 406 } // namespace extensions |
| OLD | NEW |