| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/supervised_user/legacy/supervised_user_shared_settings_
service.h" | 5 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_
service.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| 11 #include "base/json/json_reader.h" | 11 #include "base/json/json_reader.h" |
| 12 #include "base/json/json_writer.h" | 12 #include "base/json/json_writer.h" |
| 13 #include "base/values.h" | 13 #include "base/values.h" |
| 14 #include "chrome/common/pref_names.h" | 14 #include "chrome/common/pref_names.h" |
| 15 #include "components/pref_registry/pref_registry_syncable.h" | 15 #include "components/pref_registry/pref_registry_syncable.h" |
| 16 #include "components/prefs/pref_service.h" | 16 #include "components/prefs/pref_service.h" |
| 17 #include "components/prefs/scoped_user_pref_update.h" | 17 #include "components/prefs/scoped_user_pref_update.h" |
| 18 #include "sync/api/sync_change.h" | 18 #include "components/sync/api/sync_change.h" |
| 19 #include "sync/api/sync_data.h" | 19 #include "components/sync/api/sync_data.h" |
| 20 #include "sync/api/sync_error.h" | 20 #include "components/sync/api/sync_error.h" |
| 21 #include "sync/api/sync_error_factory.h" | 21 #include "components/sync/api/sync_error_factory.h" |
| 22 #include "sync/api/sync_merge_result.h" | 22 #include "components/sync/api/sync_merge_result.h" |
| 23 #include "sync/protocol/sync.pb.h" | 23 #include "components/sync/protocol/sync.pb.h" |
| 24 | 24 |
| 25 using base::DictionaryValue; | 25 using base::DictionaryValue; |
| 26 using base::Value; | 26 using base::Value; |
| 27 using syncer::ModelType; | 27 using syncer::ModelType; |
| 28 using syncer::SUPERVISED_USER_SHARED_SETTINGS; | 28 using syncer::SUPERVISED_USER_SHARED_SETTINGS; |
| 29 using syncer::SyncChange; | 29 using syncer::SyncChange; |
| 30 using syncer::SyncChangeList; | 30 using syncer::SyncChangeList; |
| 31 using syncer::SyncChangeProcessor; | 31 using syncer::SyncChangeProcessor; |
| 32 using syncer::SyncData; | 32 using syncer::SyncData; |
| 33 using syncer::SyncDataList; | 33 using syncer::SyncDataList; |
| (...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 362 NOTREACHED(); | 362 NOTREACHED(); |
| 363 break; | 363 break; |
| 364 } | 364 } |
| 365 } | 365 } |
| 366 callbacks_.Notify(su_id, key); | 366 callbacks_.Notify(su_id, key); |
| 367 } | 367 } |
| 368 | 368 |
| 369 SyncError error; | 369 SyncError error; |
| 370 return error; | 370 return error; |
| 371 } | 371 } |
| OLD | NEW |