OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "components/sync_driver/model_association_manager.h" | 5 #include "components/sync_driver/model_association_manager.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <algorithm> | 10 #include <algorithm> |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
47 // UI thread data types. | 47 // UI thread data types. |
48 syncer::BOOKMARKS, | 48 syncer::BOOKMARKS, |
49 syncer::SUPERVISED_USERS, // Syncing supervised users on initial login | 49 syncer::SUPERVISED_USERS, // Syncing supervised users on initial login |
50 // might block creating a new supervised user, | 50 // might block creating a new supervised user, |
51 // so we want to do it early. | 51 // so we want to do it early. |
52 syncer::PREFERENCES, | 52 syncer::PREFERENCES, |
53 syncer::PRIORITY_PREFERENCES, | 53 syncer::PRIORITY_PREFERENCES, |
54 syncer::EXTENSIONS, | 54 syncer::EXTENSIONS, |
55 syncer::APPS, | 55 syncer::APPS, |
56 syncer::APP_LIST, | 56 syncer::APP_LIST, |
| 57 syncer::ARC_PACKAGE, |
57 syncer::THEMES, | 58 syncer::THEMES, |
58 syncer::SEARCH_ENGINES, | 59 syncer::SEARCH_ENGINES, |
59 syncer::SESSIONS, | 60 syncer::SESSIONS, |
60 syncer::APP_NOTIFICATIONS, | 61 syncer::APP_NOTIFICATIONS, |
61 syncer::DICTIONARY, | 62 syncer::DICTIONARY, |
62 syncer::FAVICON_IMAGES, | 63 syncer::FAVICON_IMAGES, |
63 syncer::FAVICON_TRACKING, | 64 syncer::FAVICON_TRACKING, |
64 syncer::SUPERVISED_USER_SETTINGS, | 65 syncer::SUPERVISED_USER_SETTINGS, |
65 syncer::SUPERVISED_USER_SHARED_SETTINGS, | 66 syncer::SUPERVISED_USER_SHARED_SETTINGS, |
66 syncer::SUPERVISED_USER_WHITELISTS, | 67 syncer::SUPERVISED_USER_WHITELISTS, |
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
452 // At least one type is not ready. | 453 // At least one type is not ready. |
453 return; | 454 return; |
454 } | 455 } |
455 } | 456 } |
456 | 457 |
457 notified_about_ready_for_configure_ = true; | 458 notified_about_ready_for_configure_ = true; |
458 delegate_->OnAllDataTypesReadyForConfigure(); | 459 delegate_->OnAllDataTypesReadyForConfigure(); |
459 } | 460 } |
460 | 461 |
461 } // namespace sync_driver | 462 } // namespace sync_driver |
OLD | NEW |