| 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/settings/syncable_settings_storage.h" | 5 #include "chrome/browser/extensions/api/storage/syncable_settings_storage.h" |
| 6 | 6 |
| 7 #include "chrome/browser/extensions/settings/settings_namespace.h" | 7 #include "chrome/browser/extensions/api/storage/settings_namespace.h" |
| 8 #include "chrome/browser/extensions/settings/settings_sync_processor.h" | 8 #include "chrome/browser/extensions/api/storage/settings_sync_processor.h" |
| 9 #include "chrome/browser/extensions/settings/settings_sync_util.h" | 9 #include "chrome/browser/extensions/api/storage/settings_sync_util.h" |
| 10 #include "content/public/browser/browser_thread.h" | 10 #include "content/public/browser/browser_thread.h" |
| 11 #include "sync/api/sync_data.h" | 11 #include "sync/api/sync_data.h" |
| 12 #include "sync/protocol/extension_setting_specifics.pb.h" | 12 #include "sync/protocol/extension_setting_specifics.pb.h" |
| 13 | 13 |
| 14 namespace extensions { | 14 namespace extensions { |
| 15 | 15 |
| 16 using content::BrowserThread; | 16 using content::BrowserThread; |
| 17 | 17 |
| 18 SyncableSettingsStorage::SyncableSettingsStorage( | 18 SyncableSettingsStorage::SyncableSettingsStorage( |
| 19 const scoped_refptr<ObserverListThreadSafe<SettingsObserver> >& | 19 const scoped_refptr<ObserverListThreadSafe<SettingsObserver> >& |
| (...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 375 FROM_HERE, | 375 FROM_HERE, |
| 376 std::string("Error pushing sync remove to local settings: ") + | 376 std::string("Error pushing sync remove to local settings: ") + |
| 377 result->error(), | 377 result->error(), |
| 378 sync_processor_->type()); | 378 sync_processor_->type()); |
| 379 } | 379 } |
| 380 changes->push_back(ValueStoreChange(key, old_value, NULL)); | 380 changes->push_back(ValueStoreChange(key, old_value, NULL)); |
| 381 return syncer::SyncError(); | 381 return syncer::SyncError(); |
| 382 } | 382 } |
| 383 | 383 |
| 384 } // namespace extensions | 384 } // namespace extensions |
| OLD | NEW |