| 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 "base/strings/stringprintf.h" | 7 #include "base/strings/stringprintf.h" |
| 8 #include "chrome/browser/extensions/api/storage/settings_namespace.h" | |
| 9 #include "chrome/browser/extensions/api/storage/settings_sync_processor.h" | 8 #include "chrome/browser/extensions/api/storage/settings_sync_processor.h" |
| 10 #include "chrome/browser/extensions/api/storage/settings_sync_util.h" | 9 #include "chrome/browser/extensions/api/storage/settings_sync_util.h" |
| 11 #include "content/public/browser/browser_thread.h" | 10 #include "content/public/browser/browser_thread.h" |
| 11 #include "extensions/browser/api/storage/settings_namespace.h" |
| 12 #include "sync/api/sync_data.h" | 12 #include "sync/api/sync_data.h" |
| 13 #include "sync/protocol/extension_setting_specifics.pb.h" | 13 #include "sync/protocol/extension_setting_specifics.pb.h" |
| 14 | 14 |
| 15 namespace extensions { | 15 namespace extensions { |
| 16 | 16 |
| 17 using content::BrowserThread; | 17 using content::BrowserThread; |
| 18 | 18 |
| 19 SyncableSettingsStorage::SyncableSettingsStorage( | 19 SyncableSettingsStorage::SyncableSettingsStorage( |
| 20 const scoped_refptr<ObserverListThreadSafe<SettingsObserver> >& | 20 const scoped_refptr<ObserverListThreadSafe<SettingsObserver> >& |
| 21 observers, | 21 observers, |
| (...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 416 syncer::SyncError::DATATYPE_ERROR, | 416 syncer::SyncError::DATATYPE_ERROR, |
| 417 base::StringPrintf("Error pushing sync remove to local settings: %s", | 417 base::StringPrintf("Error pushing sync remove to local settings: %s", |
| 418 result->error().message.c_str()), | 418 result->error().message.c_str()), |
| 419 sync_processor_->type()); | 419 sync_processor_->type()); |
| 420 } | 420 } |
| 421 changes->push_back(ValueStoreChange(key, old_value, NULL)); | 421 changes->push_back(ValueStoreChange(key, old_value, NULL)); |
| 422 return syncer::SyncError(); | 422 return syncer::SyncError(); |
| 423 } | 423 } |
| 424 | 424 |
| 425 } // namespace extensions | 425 } // namespace extensions |
| OLD | NEW |