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 12 matching lines...) Expand all Loading... |
23 // that in most cases types finish loading before this timeout. | 23 // that in most cases types finish loading before this timeout. |
24 const int64 kDataTypeLoadWaitTimeInSeconds = 120; | 24 const int64 kDataTypeLoadWaitTimeInSeconds = 120; |
25 namespace { | 25 namespace { |
26 | 26 |
27 static const syncer::ModelType kStartOrder[] = { | 27 static const syncer::ModelType kStartOrder[] = { |
28 syncer::NIGORI, // Listed for completeness. | 28 syncer::NIGORI, // Listed for completeness. |
29 syncer::DEVICE_INFO, // Listed for completeness. | 29 syncer::DEVICE_INFO, // Listed for completeness. |
30 syncer::EXPERIMENTS, // Listed for completeness. | 30 syncer::EXPERIMENTS, // Listed for completeness. |
31 syncer::PROXY_TABS, // Listed for completeness. | 31 syncer::PROXY_TABS, // Listed for completeness. |
32 syncer::BOOKMARKS, // UI thread datatypes. | 32 syncer::BOOKMARKS, // UI thread datatypes. |
| 33 syncer::MANAGED_USERS, // Syncing managed users on initial login might |
| 34 // block creating a new managed user, so we |
| 35 // want to do it early. |
33 syncer::PREFERENCES, | 36 syncer::PREFERENCES, |
34 syncer::PRIORITY_PREFERENCES, | 37 syncer::PRIORITY_PREFERENCES, |
35 syncer::EXTENSIONS, | 38 syncer::EXTENSIONS, |
36 syncer::APPS, | 39 syncer::APPS, |
37 syncer::THEMES, | 40 syncer::THEMES, |
38 syncer::SEARCH_ENGINES, | 41 syncer::SEARCH_ENGINES, |
39 syncer::SESSIONS, | 42 syncer::SESSIONS, |
40 syncer::APP_NOTIFICATIONS, | 43 syncer::APP_NOTIFICATIONS, |
41 syncer::DICTIONARY, | 44 syncer::DICTIONARY, |
42 syncer::FAVICON_IMAGES, | 45 syncer::FAVICON_IMAGES, |
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
577 } | 580 } |
578 return result; | 581 return result; |
579 } | 582 } |
580 | 583 |
581 base::OneShotTimer<ModelAssociationManager>* | 584 base::OneShotTimer<ModelAssociationManager>* |
582 ModelAssociationManager::GetTimerForTesting() { | 585 ModelAssociationManager::GetTimerForTesting() { |
583 return &timer_; | 586 return &timer_; |
584 } | 587 } |
585 | 588 |
586 } // namespace browser_sync | 589 } // namespace browser_sync |
OLD | NEW |