| 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 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 223 case syncer::APPS: | 223 case syncer::APPS: |
| 224 return prefs::kSyncApps; | 224 return prefs::kSyncApps; |
| 225 case syncer::SEARCH_ENGINES: | 225 case syncer::SEARCH_ENGINES: |
| 226 return prefs::kSyncSearchEngines; | 226 return prefs::kSyncSearchEngines; |
| 227 case syncer::SESSIONS: | 227 case syncer::SESSIONS: |
| 228 return prefs::kSyncSessions; | 228 return prefs::kSyncSessions; |
| 229 case syncer::APP_NOTIFICATIONS: | 229 case syncer::APP_NOTIFICATIONS: |
| 230 return prefs::kSyncAppNotifications; | 230 return prefs::kSyncAppNotifications; |
| 231 case syncer::HISTORY_DELETE_DIRECTIVES: | 231 case syncer::HISTORY_DELETE_DIRECTIVES: |
| 232 return prefs::kSyncHistoryDeleteDirectives; | 232 return prefs::kSyncHistoryDeleteDirectives; |
| 233 case syncer::SYNCED_NOTIFICATIONS: |
| 234 return prefs::kSyncSyncedNotifications; |
| 233 default: | 235 default: |
| 234 break; | 236 break; |
| 235 } | 237 } |
| 236 NOTREACHED(); | 238 NOTREACHED(); |
| 237 return NULL; | 239 return NULL; |
| 238 } | 240 } |
| 239 | 241 |
| 240 #if defined(OS_CHROMEOS) | 242 #if defined(OS_CHROMEOS) |
| 241 std::string SyncPrefs::GetSpareBootstrapToken() const { | 243 std::string SyncPrefs::GetSpareBootstrapToken() const { |
| 242 DCHECK(CalledOnValidThread()); | 244 DCHECK(CalledOnValidThread()); |
| (...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 432 if (types.Has(i->first)) | 434 if (types.Has(i->first)) |
| 433 types_with_groups.PutAll(i->second); | 435 types_with_groups.PutAll(i->second); |
| 434 else | 436 else |
| 435 types_with_groups.RemoveAll(i->second); | 437 types_with_groups.RemoveAll(i->second); |
| 436 } | 438 } |
| 437 types_with_groups.RetainAll(registered_types); | 439 types_with_groups.RetainAll(registered_types); |
| 438 return types_with_groups; | 440 return types_with_groups; |
| 439 } | 441 } |
| 440 | 442 |
| 441 } // namespace browser_sync | 443 } // namespace browser_sync |
| OLD | NEW |