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/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/prefs/pref_member.h" | 9 #include "base/prefs/pref_member.h" |
10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
333 case syncer::HISTORY_DELETE_DIRECTIVES: | 333 case syncer::HISTORY_DELETE_DIRECTIVES: |
334 return prefs::kSyncHistoryDeleteDirectives; | 334 return prefs::kSyncHistoryDeleteDirectives; |
335 case syncer::SYNCED_NOTIFICATIONS: | 335 case syncer::SYNCED_NOTIFICATIONS: |
336 return prefs::kSyncSyncedNotifications; | 336 return prefs::kSyncSyncedNotifications; |
337 case syncer::DICTIONARY: | 337 case syncer::DICTIONARY: |
338 return prefs::kSyncDictionary; | 338 return prefs::kSyncDictionary; |
339 case syncer::FAVICON_IMAGES: | 339 case syncer::FAVICON_IMAGES: |
340 return prefs::kSyncFaviconImages; | 340 return prefs::kSyncFaviconImages; |
341 case syncer::FAVICON_TRACKING: | 341 case syncer::FAVICON_TRACKING: |
342 return prefs::kSyncFaviconTracking; | 342 return prefs::kSyncFaviconTracking; |
| 343 case syncer::MANAGED_USER_SETTINGS: |
| 344 return prefs::kSyncManagedUserSettings; |
343 case syncer::PROXY_TABS: | 345 case syncer::PROXY_TABS: |
344 return prefs::kSyncTabs; | 346 return prefs::kSyncTabs; |
345 case syncer::PRIORITY_PREFERENCES: | 347 case syncer::PRIORITY_PREFERENCES: |
346 return prefs::kSyncPriorityPreferences; | 348 return prefs::kSyncPriorityPreferences; |
347 default: | 349 default: |
348 break; | 350 break; |
349 } | 351 } |
350 NOTREACHED(); | 352 NOTREACHED(); |
351 return NULL; | 353 return NULL; |
352 } | 354 } |
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
482 for (PrefGroupsMap::const_iterator i = pref_groups_.begin(); | 484 for (PrefGroupsMap::const_iterator i = pref_groups_.begin(); |
483 i != pref_groups_.end(); ++i) { | 485 i != pref_groups_.end(); ++i) { |
484 if (types.Has(i->first)) | 486 if (types.Has(i->first)) |
485 types_with_groups.PutAll(i->second); | 487 types_with_groups.PutAll(i->second); |
486 } | 488 } |
487 types_with_groups.RetainAll(registered_types); | 489 types_with_groups.RetainAll(registered_types); |
488 return types_with_groups; | 490 return types_with_groups; |
489 } | 491 } |
490 | 492 |
491 } // namespace browser_sync | 493 } // namespace browser_sync |
OLD | NEW |