| 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 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 331 case syncer::MANAGED_USER_SETTINGS: | 331 case syncer::MANAGED_USER_SETTINGS: |
| 332 return prefs::kSyncManagedUserSettings; | 332 return prefs::kSyncManagedUserSettings; |
| 333 case syncer::PROXY_TABS: | 333 case syncer::PROXY_TABS: |
| 334 return prefs::kSyncTabs; | 334 return prefs::kSyncTabs; |
| 335 case syncer::PRIORITY_PREFERENCES: | 335 case syncer::PRIORITY_PREFERENCES: |
| 336 return prefs::kSyncPriorityPreferences; | 336 return prefs::kSyncPriorityPreferences; |
| 337 case syncer::MANAGED_USERS: | 337 case syncer::MANAGED_USERS: |
| 338 return prefs::kSyncManagedUsers; | 338 return prefs::kSyncManagedUsers; |
| 339 case syncer::ARTICLES: | 339 case syncer::ARTICLES: |
| 340 return prefs::kSyncArticles; | 340 return prefs::kSyncArticles; |
| 341 case syncer::MANAGED_USER_SHARED_SETTINGS: |
| 342 return prefs::kSyncManagedUserSharedSettings; |
| 341 default: | 343 default: |
| 342 break; | 344 break; |
| 343 } | 345 } |
| 344 NOTREACHED(); | 346 NOTREACHED(); |
| 345 return NULL; | 347 return NULL; |
| 346 } | 348 } |
| 347 | 349 |
| 348 #if defined(OS_CHROMEOS) | 350 #if defined(OS_CHROMEOS) |
| 349 std::string SyncPrefs::GetSpareBootstrapToken() const { | 351 std::string SyncPrefs::GetSpareBootstrapToken() const { |
| 350 DCHECK(CalledOnValidThread()); | 352 DCHECK(CalledOnValidThread()); |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 471 for (PrefGroupsMap::const_iterator i = pref_groups_.begin(); | 473 for (PrefGroupsMap::const_iterator i = pref_groups_.begin(); |
| 472 i != pref_groups_.end(); ++i) { | 474 i != pref_groups_.end(); ++i) { |
| 473 if (types.Has(i->first)) | 475 if (types.Has(i->first)) |
| 474 types_with_groups.PutAll(i->second); | 476 types_with_groups.PutAll(i->second); |
| 475 } | 477 } |
| 476 types_with_groups.RetainAll(registered_types); | 478 types_with_groups.RetainAll(registered_types); |
| 477 return types_with_groups; | 479 return types_with_groups; |
| 478 } | 480 } |
| 479 | 481 |
| 480 } // namespace browser_sync | 482 } // namespace browser_sync |
| OLD | NEW |