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

Side by Side Diff: components/syncable_prefs/pref_model_associator.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 "components/syncable_prefs/pref_model_associator.h" 5 #include "components/syncable_prefs/pref_model_associator.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/json/json_reader.h" 10 #include "base/json/json_reader.h"
11 #include "base/json/json_string_value_serializer.h" 11 #include "base/json/json_string_value_serializer.h"
12 #include "base/location.h" 12 #include "base/location.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/memory/ptr_util.h" 14 #include "base/memory/ptr_util.h"
15 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
16 #include "base/values.h" 16 #include "base/values.h"
17 #include "components/prefs/pref_service.h" 17 #include "components/prefs/pref_service.h"
18 #include "components/sync/api/sync_change.h" 18 #include "components/sync/model/sync_change.h"
19 #include "components/sync/api/sync_error_factory.h" 19 #include "components/sync/model/sync_error_factory.h"
20 #include "components/sync/protocol/preference_specifics.pb.h" 20 #include "components/sync/protocol/preference_specifics.pb.h"
21 #include "components/sync/protocol/sync.pb.h" 21 #include "components/sync/protocol/sync.pb.h"
22 #include "components/syncable_prefs/pref_model_associator_client.h" 22 #include "components/syncable_prefs/pref_model_associator_client.h"
23 #include "components/syncable_prefs/pref_service_syncable.h" 23 #include "components/syncable_prefs/pref_service_syncable.h"
24 24
25 using syncer::PREFERENCES; 25 using syncer::PREFERENCES;
26 using syncer::PRIORITY_PREFERENCES; 26 using syncer::PRIORITY_PREFERENCES;
27 27
28 namespace syncable_prefs { 28 namespace syncable_prefs {
29 29
(...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 bool from_sync) const { 536 bool from_sync) const {
537 auto observer_iter = synced_pref_observers_.find(path); 537 auto observer_iter = synced_pref_observers_.find(path);
538 if (observer_iter == synced_pref_observers_.end()) 538 if (observer_iter == synced_pref_observers_.end())
539 return; 539 return;
540 SyncedPrefObserverList* observers = observer_iter->second.get(); 540 SyncedPrefObserverList* observers = observer_iter->second.get();
541 FOR_EACH_OBSERVER(SyncedPrefObserver, *observers, 541 FOR_EACH_OBSERVER(SyncedPrefObserver, *observers,
542 OnSyncedPrefChanged(path, from_sync)); 542 OnSyncedPrefChanged(path, from_sync));
543 } 543 }
544 544
545 } // namespace syncable_prefs 545 } // namespace syncable_prefs
OLDNEW
« no previous file with comments | « components/syncable_prefs/pref_model_associator.h ('k') | components/syncable_prefs/pref_service_syncable_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698