| 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 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 318 case syncer::SEARCH_ENGINES: | 318 case syncer::SEARCH_ENGINES: |
| 319 return prefs::kSyncSearchEngines; | 319 return prefs::kSyncSearchEngines; |
| 320 case syncer::SESSIONS: | 320 case syncer::SESSIONS: |
| 321 return prefs::kSyncSessions; | 321 return prefs::kSyncSessions; |
| 322 case syncer::APP_NOTIFICATIONS: | 322 case syncer::APP_NOTIFICATIONS: |
| 323 return prefs::kSyncAppNotifications; | 323 return prefs::kSyncAppNotifications; |
| 324 case syncer::HISTORY_DELETE_DIRECTIVES: | 324 case syncer::HISTORY_DELETE_DIRECTIVES: |
| 325 return prefs::kSyncHistoryDeleteDirectives; | 325 return prefs::kSyncHistoryDeleteDirectives; |
| 326 case syncer::SYNCED_NOTIFICATIONS: | 326 case syncer::SYNCED_NOTIFICATIONS: |
| 327 return prefs::kSyncSyncedNotifications; | 327 return prefs::kSyncSyncedNotifications; |
| 328 case syncer::SYNCED_NOTIFICATION_APP_INFO: |
| 329 return prefs::kSyncSyncedNotificationAppInfo; |
| 328 case syncer::DICTIONARY: | 330 case syncer::DICTIONARY: |
| 329 return prefs::kSyncDictionary; | 331 return prefs::kSyncDictionary; |
| 330 case syncer::FAVICON_IMAGES: | 332 case syncer::FAVICON_IMAGES: |
| 331 return prefs::kSyncFaviconImages; | 333 return prefs::kSyncFaviconImages; |
| 332 case syncer::FAVICON_TRACKING: | 334 case syncer::FAVICON_TRACKING: |
| 333 return prefs::kSyncFaviconTracking; | 335 return prefs::kSyncFaviconTracking; |
| 334 case syncer::MANAGED_USER_SETTINGS: | 336 case syncer::MANAGED_USER_SETTINGS: |
| 335 return prefs::kSyncManagedUserSettings; | 337 return prefs::kSyncManagedUserSettings; |
| 336 case syncer::PROXY_TABS: | 338 case syncer::PROXY_TABS: |
| 337 return prefs::kSyncTabs; | 339 return prefs::kSyncTabs; |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 477 for (PrefGroupsMap::const_iterator i = pref_groups_.begin(); | 479 for (PrefGroupsMap::const_iterator i = pref_groups_.begin(); |
| 478 i != pref_groups_.end(); ++i) { | 480 i != pref_groups_.end(); ++i) { |
| 479 if (types.Has(i->first)) | 481 if (types.Has(i->first)) |
| 480 types_with_groups.PutAll(i->second); | 482 types_with_groups.PutAll(i->second); |
| 481 } | 483 } |
| 482 types_with_groups.RetainAll(registered_types); | 484 types_with_groups.RetainAll(registered_types); |
| 483 return types_with_groups; | 485 return types_with_groups; |
| 484 } | 486 } |
| 485 | 487 |
| 486 } // namespace browser_sync | 488 } // namespace browser_sync |
| OLD | NEW |