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 <algorithm> | 5 #include <algorithm> |
6 #include <functional> | 6 #include <functional> |
7 | 7 |
8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
9 | 9 |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
44 syncer::THEMES, | 44 syncer::THEMES, |
45 syncer::SEARCH_ENGINES, | 45 syncer::SEARCH_ENGINES, |
46 syncer::SESSIONS, | 46 syncer::SESSIONS, |
47 syncer::APP_NOTIFICATIONS, | 47 syncer::APP_NOTIFICATIONS, |
48 syncer::AUTOFILL, // Non-UI thread datatypes. | 48 syncer::AUTOFILL, // Non-UI thread datatypes. |
49 syncer::AUTOFILL_PROFILE, | 49 syncer::AUTOFILL_PROFILE, |
50 syncer::EXTENSION_SETTINGS, | 50 syncer::EXTENSION_SETTINGS, |
51 syncer::APP_SETTINGS, | 51 syncer::APP_SETTINGS, |
52 syncer::TYPED_URLS, | 52 syncer::TYPED_URLS, |
53 syncer::PASSWORDS, | 53 syncer::PASSWORDS, |
| 54 syncer::HISTORY_DELETE_DIRECTIVES, |
54 }; | 55 }; |
55 | 56 |
56 COMPILE_ASSERT(arraysize(kStartOrder) == | 57 COMPILE_ASSERT(arraysize(kStartOrder) == |
57 syncer::MODEL_TYPE_COUNT - syncer::FIRST_REAL_MODEL_TYPE, | 58 syncer::MODEL_TYPE_COUNT - syncer::FIRST_REAL_MODEL_TYPE, |
58 kStartOrder_IncorrectSize); | 59 kStartOrder_IncorrectSize); |
59 | 60 |
60 // Comparator used when sorting data type controllers. | 61 // Comparator used when sorting data type controllers. |
61 class SortComparator : public std::binary_function<DataTypeController*, | 62 class SortComparator : public std::binary_function<DataTypeController*, |
62 DataTypeController*, | 63 DataTypeController*, |
63 bool> { | 64 bool> { |
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
501 } | 502 } |
502 return result; | 503 return result; |
503 } | 504 } |
504 | 505 |
505 base::OneShotTimer<ModelAssociationManager>* | 506 base::OneShotTimer<ModelAssociationManager>* |
506 ModelAssociationManager::GetTimerForTesting() { | 507 ModelAssociationManager::GetTimerForTesting() { |
507 return &timer_; | 508 return &timer_; |
508 } | 509 } |
509 | 510 |
510 } // namespace browser_sync | 511 } // namespace browser_sync |
OLD | NEW |