| 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 18 matching lines...) Expand all Loading... |
| 29 // Kick off the association of the non-UI types first so they can associate | 29 // Kick off the association of the non-UI types first so they can associate |
| 30 // in parallel with the UI types. | 30 // in parallel with the UI types. |
| 31 syncer::PASSWORDS, | 31 syncer::PASSWORDS, |
| 32 syncer::AUTOFILL, | 32 syncer::AUTOFILL, |
| 33 syncer::AUTOFILL_PROFILE, | 33 syncer::AUTOFILL_PROFILE, |
| 34 syncer::EXTENSION_SETTINGS, | 34 syncer::EXTENSION_SETTINGS, |
| 35 syncer::APP_SETTINGS, | 35 syncer::APP_SETTINGS, |
| 36 syncer::TYPED_URLS, | 36 syncer::TYPED_URLS, |
| 37 syncer::HISTORY_DELETE_DIRECTIVES, | 37 syncer::HISTORY_DELETE_DIRECTIVES, |
| 38 syncer::SYNCED_NOTIFICATIONS, | 38 syncer::SYNCED_NOTIFICATIONS, |
| 39 syncer::SYNCED_NOTIFICATION_APP_INFO, |
| 39 | 40 |
| 40 // UI thread data types. | 41 // UI thread data types. |
| 41 syncer::BOOKMARKS, | 42 syncer::BOOKMARKS, |
| 42 syncer::MANAGED_USERS, // Syncing managed users on initial login might | 43 syncer::MANAGED_USERS, // Syncing managed users on initial login might |
| 43 // block creating a new managed user, so we | 44 // block creating a new managed user, so we |
| 44 // want to do it early. | 45 // want to do it early. |
| 45 syncer::PREFERENCES, | 46 syncer::PREFERENCES, |
| 46 syncer::PRIORITY_PREFERENCES, | 47 syncer::PRIORITY_PREFERENCES, |
| 47 syncer::EXTENSIONS, | 48 syncer::EXTENSIONS, |
| 48 syncer::APPS, | 49 syncer::APPS, |
| (...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 433 | 434 |
| 434 result_processor_->OnModelAssociationDone(result); | 435 result_processor_->OnModelAssociationDone(result); |
| 435 } | 436 } |
| 436 | 437 |
| 437 base::OneShotTimer<ModelAssociationManager>* | 438 base::OneShotTimer<ModelAssociationManager>* |
| 438 ModelAssociationManager::GetTimerForTesting() { | 439 ModelAssociationManager::GetTimerForTesting() { |
| 439 return &timer_; | 440 return &timer_; |
| 440 } | 441 } |
| 441 | 442 |
| 442 } // namespace browser_sync | 443 } // namespace browser_sync |
| OLD | NEW |