| 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/settings/syncable_settings_storage.h" |
| 6 | 6 |
| 7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
| 8 #include "chrome/browser/extensions/settings/settings_namespace.h" | 8 #include "chrome/browser/extensions/settings/settings_namespace.h" |
| 9 #include "chrome/browser/extensions/settings/settings_sync_util.h" | 9 #include "chrome/browser/extensions/settings/settings_sync_util.h" |
| 10 #include "chrome/browser/sync/api/sync_data.h" | 10 #include "chrome/browser/sync/api/sync_data.h" |
| 11 #include "chrome/browser/sync/protocol/extension_setting_specifics.pb.h" | |
| 12 #include "content/public/browser/browser_thread.h" | 11 #include "content/public/browser/browser_thread.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> >& |
| 20 observers, | 20 observers, |
| 21 const std::string& extension_id, | 21 const std::string& extension_id, |
| 22 SettingsStorage* delegate) | 22 SettingsStorage* delegate) |
| (...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 452 FROM_HERE, | 452 FROM_HERE, |
| 453 std::string("Error pushing sync remove to local settings: ") + | 453 std::string("Error pushing sync remove to local settings: ") + |
| 454 result.error(), | 454 result.error(), |
| 455 sync_type_); | 455 sync_type_); |
| 456 } | 456 } |
| 457 changes->push_back(SettingChange(key, old_value, NULL)); | 457 changes->push_back(SettingChange(key, old_value, NULL)); |
| 458 return SyncError(); | 458 return SyncError(); |
| 459 } | 459 } |
| 460 | 460 |
| 461 } // namespace extensions | 461 } // namespace extensions |
| OLD | NEW |