| 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/sync/sync_prefs.h" | 5 #include "chrome/browser/sync/sync_prefs.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
| 9 #include "base/prefs/public/pref_member.h" | 9 #include "base/prefs/public/pref_member.h" |
| 10 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
| 11 #include "base/values.h" | 11 #include "base/values.h" |
| 12 #include "build/build_config.h" | 12 #include "build/build_config.h" |
| 13 #include "chrome/browser/prefs/pref_registry_syncable.h" | |
| 14 #include "chrome/browser/profiles/profile_io_data.h" | 13 #include "chrome/browser/profiles/profile_io_data.h" |
| 15 #include "chrome/browser/sync/profile_sync_service.h" | 14 #include "chrome/browser/sync/profile_sync_service.h" |
| 16 #include "chrome/common/chrome_notification_types.h" | 15 #include "chrome/common/chrome_notification_types.h" |
| 17 #include "chrome/common/pref_names.h" | 16 #include "chrome/common/pref_names.h" |
| 17 #include "components/user_prefs/pref_registry_syncable.h" |
| 18 #include "content/public/browser/browser_thread.h" | 18 #include "content/public/browser/browser_thread.h" |
| 19 #include "content/public/browser/notification_details.h" | 19 #include "content/public/browser/notification_details.h" |
| 20 #include "content/public/browser/notification_source.h" | 20 #include "content/public/browser/notification_source.h" |
| 21 | 21 |
| 22 namespace browser_sync { | 22 namespace browser_sync { |
| 23 | 23 |
| 24 SyncPrefObserver::~SyncPrefObserver() {} | 24 SyncPrefObserver::~SyncPrefObserver() {} |
| 25 | 25 |
| 26 SyncPrefs::SyncPrefs(PrefService* pref_service) | 26 SyncPrefs::SyncPrefs(PrefService* pref_service) |
| 27 : pref_service_(pref_service) { | 27 : pref_service_(pref_service) { |
| (...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 453 if (types.Has(i->first)) | 453 if (types.Has(i->first)) |
| 454 types_with_groups.PutAll(i->second); | 454 types_with_groups.PutAll(i->second); |
| 455 else | 455 else |
| 456 types_with_groups.RemoveAll(i->second); | 456 types_with_groups.RemoveAll(i->second); |
| 457 } | 457 } |
| 458 types_with_groups.RetainAll(registered_types); | 458 types_with_groups.RetainAll(registered_types); |
| 459 return types_with_groups; | 459 return types_with_groups; |
| 460 } | 460 } |
| 461 | 461 |
| 462 } // namespace browser_sync | 462 } // namespace browser_sync |
| OLD | NEW |