Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Side by Side Diff: chrome/browser/extensions/api/storage/syncable_settings_storage.cc

Issue 2401223002: [Sync] Renaming sync/api* to sync/model*. (Closed)
Patch Set: Missed a comment in a DEPS file, and rebasing. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/storage/syncable_settings_storage.h ('k') | chrome/browser/extensions/app_process_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698