| 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/string_number_conversions.h" | 8 #include "base/string_number_conversions.h" |
| 9 #include "base/values.h" | 9 #include "base/values.h" |
| 10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
| (...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 215 case syncer::APP_SETTINGS: | 215 case syncer::APP_SETTINGS: |
| 216 return prefs::kSyncAppSettings; | 216 return prefs::kSyncAppSettings; |
| 217 case syncer::APPS: | 217 case syncer::APPS: |
| 218 return prefs::kSyncApps; | 218 return prefs::kSyncApps; |
| 219 case syncer::SEARCH_ENGINES: | 219 case syncer::SEARCH_ENGINES: |
| 220 return prefs::kSyncSearchEngines; | 220 return prefs::kSyncSearchEngines; |
| 221 case syncer::SESSIONS: | 221 case syncer::SESSIONS: |
| 222 return prefs::kSyncSessions; | 222 return prefs::kSyncSessions; |
| 223 case syncer::APP_NOTIFICATIONS: | 223 case syncer::APP_NOTIFICATIONS: |
| 224 return prefs::kSyncAppNotifications; | 224 return prefs::kSyncAppNotifications; |
| 225 case syncer::HISTORY_DELETE_DIRECTIVES: |
| 226 return prefs::kSyncHistoryDeleteDirectives; |
| 225 default: | 227 default: |
| 226 break; | 228 break; |
| 227 } | 229 } |
| 228 NOTREACHED(); | 230 NOTREACHED(); |
| 229 return NULL; | 231 return NULL; |
| 230 } | 232 } |
| 231 | 233 |
| 232 #if defined(OS_CHROMEOS) | 234 #if defined(OS_CHROMEOS) |
| 233 std::string SyncPrefs::GetSpareBootstrapToken() const { | 235 std::string SyncPrefs::GetSpareBootstrapToken() const { |
| 234 DCHECK(CalledOnValidThread()); | 236 DCHECK(CalledOnValidThread()); |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 433 if (types.Has(i->first)) | 435 if (types.Has(i->first)) |
| 434 types_with_groups.PutAll(i->second); | 436 types_with_groups.PutAll(i->second); |
| 435 else | 437 else |
| 436 types_with_groups.RemoveAll(i->second); | 438 types_with_groups.RemoveAll(i->second); |
| 437 } | 439 } |
| 438 types_with_groups.RetainAll(registered_types); | 440 types_with_groups.RetainAll(registered_types); |
| 439 return types_with_groups; | 441 return types_with_groups; |
| 440 } | 442 } |
| 441 | 443 |
| 442 } // namespace browser_sync | 444 } // namespace browser_sync |
| OLD | NEW |