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

Side by Side Diff: components/syncable_prefs/pref_model_associator.cc

Issue 1651203002: Update components for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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/prefs/pref_service.h"
15 #include "base/stl_util.h" 14 #include "base/stl_util.h"
16 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
17 #include "base/values.h" 16 #include "base/values.h"
17 #include "components/prefs/pref_service.h"
18 #include "components/syncable_prefs/pref_model_associator_client.h" 18 #include "components/syncable_prefs/pref_model_associator_client.h"
19 #include "components/syncable_prefs/pref_service_syncable.h" 19 #include "components/syncable_prefs/pref_service_syncable.h"
20 #include "sync/api/sync_change.h" 20 #include "sync/api/sync_change.h"
21 #include "sync/api/sync_error_factory.h" 21 #include "sync/api/sync_error_factory.h"
22 #include "sync/protocol/preference_specifics.pb.h" 22 #include "sync/protocol/preference_specifics.pb.h"
23 #include "sync/protocol/sync.pb.h" 23 #include "sync/protocol/sync.pb.h"
24 24
25 using syncer::PREFERENCES; 25 using syncer::PREFERENCES;
26 using syncer::PRIORITY_PREFERENCES; 26 using syncer::PRIORITY_PREFERENCES;
27 27
(...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after
529 SyncedPrefObserverMap::const_iterator observer_iter = 529 SyncedPrefObserverMap::const_iterator observer_iter =
530 synced_pref_observers_.find(path); 530 synced_pref_observers_.find(path);
531 if (observer_iter == synced_pref_observers_.end()) 531 if (observer_iter == synced_pref_observers_.end())
532 return; 532 return;
533 SyncedPrefObserverList* observers = observer_iter->second; 533 SyncedPrefObserverList* observers = observer_iter->second;
534 FOR_EACH_OBSERVER(SyncedPrefObserver, *observers, 534 FOR_EACH_OBSERVER(SyncedPrefObserver, *observers,
535 OnSyncedPrefChanged(path, from_sync)); 535 OnSyncedPrefChanged(path, from_sync));
536 } 536 }
537 537
538 } // namespace syncable_prefs 538 } // namespace syncable_prefs
OLDNEW
« no previous file with comments | « components/syncable_prefs/DEPS ('k') | components/syncable_prefs/pref_model_associator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698