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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 syncer::APPS, | 48 syncer::APPS, |
49 syncer::APP_LIST, | 49 syncer::APP_LIST, |
50 syncer::THEMES, | 50 syncer::THEMES, |
51 syncer::SEARCH_ENGINES, | 51 syncer::SEARCH_ENGINES, |
52 syncer::SESSIONS, | 52 syncer::SESSIONS, |
53 syncer::APP_NOTIFICATIONS, | 53 syncer::APP_NOTIFICATIONS, |
54 syncer::DICTIONARY, | 54 syncer::DICTIONARY, |
55 syncer::FAVICON_IMAGES, | 55 syncer::FAVICON_IMAGES, |
56 syncer::FAVICON_TRACKING, | 56 syncer::FAVICON_TRACKING, |
57 syncer::MANAGED_USER_SETTINGS, | 57 syncer::MANAGED_USER_SETTINGS, |
| 58 syncer::MANAGED_USER_SHARED_SETTINGS, |
58 syncer::ARTICLES, | 59 syncer::ARTICLES, |
59 }; | 60 }; |
60 | 61 |
61 COMPILE_ASSERT(arraysize(kStartOrder) == | 62 COMPILE_ASSERT(arraysize(kStartOrder) == |
62 syncer::MODEL_TYPE_COUNT - syncer::FIRST_REAL_MODEL_TYPE, | 63 syncer::MODEL_TYPE_COUNT - syncer::FIRST_REAL_MODEL_TYPE, |
63 kStartOrder_IncorrectSize); | 64 kStartOrder_IncorrectSize); |
64 | 65 |
65 // The amount of time we wait for association to finish. If some types haven't | 66 // The amount of time we wait for association to finish. If some types haven't |
66 // finished association by the time, configuration result will be | 67 // finished association by the time, configuration result will be |
67 // PARTIAL_SUCCESS and DataTypeManager is notified of the unfinished types. | 68 // PARTIAL_SUCCESS and DataTypeManager is notified of the unfinished types. |
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
432 | 433 |
433 result_processor_->OnModelAssociationDone(result); | 434 result_processor_->OnModelAssociationDone(result); |
434 } | 435 } |
435 | 436 |
436 base::OneShotTimer<ModelAssociationManager>* | 437 base::OneShotTimer<ModelAssociationManager>* |
437 ModelAssociationManager::GetTimerForTesting() { | 438 ModelAssociationManager::GetTimerForTesting() { |
438 return &timer_; | 439 return &timer_; |
439 } | 440 } |
440 | 441 |
441 } // namespace browser_sync | 442 } // namespace browser_sync |
OLD | NEW |