| 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 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 344 case syncer::FAVICON_IMAGES: | 344 case syncer::FAVICON_IMAGES: |
| 345 return prefs::kSyncFaviconImages; | 345 return prefs::kSyncFaviconImages; |
| 346 case syncer::FAVICON_TRACKING: | 346 case syncer::FAVICON_TRACKING: |
| 347 return prefs::kSyncFaviconTracking; | 347 return prefs::kSyncFaviconTracking; |
| 348 case syncer::MANAGED_USER_SETTINGS: | 348 case syncer::MANAGED_USER_SETTINGS: |
| 349 return prefs::kSyncManagedUserSettings; | 349 return prefs::kSyncManagedUserSettings; |
| 350 case syncer::PROXY_TABS: | 350 case syncer::PROXY_TABS: |
| 351 return prefs::kSyncTabs; | 351 return prefs::kSyncTabs; |
| 352 case syncer::PRIORITY_PREFERENCES: | 352 case syncer::PRIORITY_PREFERENCES: |
| 353 return prefs::kSyncPriorityPreferences; | 353 return prefs::kSyncPriorityPreferences; |
| 354 case syncer::MANAGED_USERS: |
| 355 return prefs::kSyncManagedUsers; |
| 354 default: | 356 default: |
| 355 break; | 357 break; |
| 356 } | 358 } |
| 357 NOTREACHED(); | 359 NOTREACHED(); |
| 358 return NULL; | 360 return NULL; |
| 359 } | 361 } |
| 360 | 362 |
| 361 #if defined(OS_CHROMEOS) | 363 #if defined(OS_CHROMEOS) |
| 362 std::string SyncPrefs::GetSpareBootstrapToken() const { | 364 std::string SyncPrefs::GetSpareBootstrapToken() const { |
| 363 DCHECK(CalledOnValidThread()); | 365 DCHECK(CalledOnValidThread()); |
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 492 for (PrefGroupsMap::const_iterator i = pref_groups_.begin(); | 494 for (PrefGroupsMap::const_iterator i = pref_groups_.begin(); |
| 493 i != pref_groups_.end(); ++i) { | 495 i != pref_groups_.end(); ++i) { |
| 494 if (types.Has(i->first)) | 496 if (types.Has(i->first)) |
| 495 types_with_groups.PutAll(i->second); | 497 types_with_groups.PutAll(i->second); |
| 496 } | 498 } |
| 497 types_with_groups.RetainAll(registered_types); | 499 types_with_groups.RetainAll(registered_types); |
| 498 return types_with_groups; | 500 return types_with_groups; |
| 499 } | 501 } |
| 500 | 502 |
| 501 } // namespace browser_sync | 503 } // namespace browser_sync |
| OLD | NEW |