| Index: chrome/browser/sync/glue/model_association_manager.cc
|
| diff --git a/chrome/browser/sync/glue/model_association_manager.cc b/chrome/browser/sync/glue/model_association_manager.cc
|
| index 4ad5bfe190b77c5bbc77861cde515ded59a9c819..9aa268cb494627b44a21099190ae1da5cb659e79 100644
|
| --- a/chrome/browser/sync/glue/model_association_manager.cc
|
| +++ b/chrome/browser/sync/glue/model_association_manager.cc
|
| @@ -36,21 +36,21 @@ const int64 kDataTypeLoadWaitTimeInSeconds = 120;
|
| namespace {
|
|
|
| static const syncable::ModelType kStartOrder[] = {
|
| - syncable::NIGORI, // Listed for completeness.
|
| - syncable::BOOKMARKS,
|
| + syncable::NIGORI, // Listed for completeness.
|
| + syncable::BOOKMARKS, // UI thread datatypes.
|
| syncable::PREFERENCES,
|
| - syncable::AUTOFILL,
|
| - syncable::AUTOFILL_PROFILE,
|
| - syncable::EXTENSION_SETTINGS,
|
| syncable::EXTENSIONS,
|
| - syncable::APP_SETTINGS,
|
| syncable::APPS,
|
| syncable::THEMES,
|
| - syncable::TYPED_URLS,
|
| - syncable::PASSWORDS,
|
| syncable::SEARCH_ENGINES,
|
| syncable::SESSIONS,
|
| syncable::APP_NOTIFICATIONS,
|
| + syncable::AUTOFILL, // Non-UI thread datatypes.
|
| + syncable::AUTOFILL_PROFILE,
|
| + syncable::EXTENSION_SETTINGS,
|
| + syncable::APP_SETTINGS,
|
| + syncable::TYPED_URLS,
|
| + syncable::PASSWORDS,
|
| };
|
|
|
| COMPILE_ASSERT(arraysize(kStartOrder) ==
|
|
|