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/glue/model_association_manager.h" | 5 #include "chrome/browser/sync/glue/model_association_manager.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <functional> | 8 #include <functional> |
9 | 9 |
10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
(...skipping 25 matching lines...) Expand all Loading... | |
36 syncer::SEARCH_ENGINES, | 36 syncer::SEARCH_ENGINES, |
37 syncer::SESSIONS, | 37 syncer::SESSIONS, |
38 syncer::APP_NOTIFICATIONS, | 38 syncer::APP_NOTIFICATIONS, |
39 syncer::AUTOFILL, // Non-UI thread datatypes. | 39 syncer::AUTOFILL, // Non-UI thread datatypes. |
40 syncer::AUTOFILL_PROFILE, | 40 syncer::AUTOFILL_PROFILE, |
41 syncer::EXTENSION_SETTINGS, | 41 syncer::EXTENSION_SETTINGS, |
42 syncer::APP_SETTINGS, | 42 syncer::APP_SETTINGS, |
43 syncer::TYPED_URLS, | 43 syncer::TYPED_URLS, |
44 syncer::PASSWORDS, | 44 syncer::PASSWORDS, |
45 syncer::HISTORY_DELETE_DIRECTIVES, | 45 syncer::HISTORY_DELETE_DIRECTIVES, |
46 syncer::DICTIONARY, | |
Nicolas Zea
2013/01/02 23:12:15
move this up into the "UI thread datatypes" sectio
please use gerrit instead
2013/01/04 23:30:50
Moved.
| |
46 }; | 47 }; |
47 | 48 |
48 COMPILE_ASSERT(arraysize(kStartOrder) == | 49 COMPILE_ASSERT(arraysize(kStartOrder) == |
49 syncer::MODEL_TYPE_COUNT - syncer::FIRST_REAL_MODEL_TYPE, | 50 syncer::MODEL_TYPE_COUNT - syncer::FIRST_REAL_MODEL_TYPE, |
50 kStartOrder_IncorrectSize); | 51 kStartOrder_IncorrectSize); |
51 | 52 |
52 // Comparator used when sorting data type controllers. | 53 // Comparator used when sorting data type controllers. |
53 class SortComparator : public std::binary_function<DataTypeController*, | 54 class SortComparator : public std::binary_function<DataTypeController*, |
54 DataTypeController*, | 55 DataTypeController*, |
55 bool> { | 56 bool> { |
(...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
544 } | 545 } |
545 return result; | 546 return result; |
546 } | 547 } |
547 | 548 |
548 base::OneShotTimer<ModelAssociationManager>* | 549 base::OneShotTimer<ModelAssociationManager>* |
549 ModelAssociationManager::GetTimerForTesting() { | 550 ModelAssociationManager::GetTimerForTesting() { |
550 return &timer_; | 551 return &timer_; |
551 } | 552 } |
552 | 553 |
553 } // namespace browser_sync | 554 } // namespace browser_sync |
OLD | NEW |