| 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 10 matching lines...) Expand all Loading... |
| 21 // not finished loading we move on to the next type. Once this type | 21 // not finished loading we move on to the next type. Once this type |
| 22 // finishes loading we will do a configure to associate this type. Note | 22 // finishes loading we will do a configure to associate this type. Note |
| 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::TABS, // Listed for completeness. |
| 31 syncer::BOOKMARKS, // UI thread datatypes. | 32 syncer::BOOKMARKS, // UI thread datatypes. |
| 32 syncer::PREFERENCES, | 33 syncer::PREFERENCES, |
| 33 syncer::PRIORITY_PREFERENCES, | 34 syncer::PRIORITY_PREFERENCES, |
| 34 syncer::EXTENSIONS, | 35 syncer::EXTENSIONS, |
| 35 syncer::APPS, | 36 syncer::APPS, |
| 36 syncer::THEMES, | 37 syncer::THEMES, |
| 37 syncer::SEARCH_ENGINES, | 38 syncer::SEARCH_ENGINES, |
| 38 syncer::SESSIONS, | 39 syncer::SESSIONS, |
| 39 syncer::APP_NOTIFICATIONS, | 40 syncer::APP_NOTIFICATIONS, |
| 40 syncer::DICTIONARY, | 41 syncer::DICTIONARY, |
| (...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 548 } | 549 } |
| 549 return result; | 550 return result; |
| 550 } | 551 } |
| 551 | 552 |
| 552 base::OneShotTimer<ModelAssociationManager>* | 553 base::OneShotTimer<ModelAssociationManager>* |
| 553 ModelAssociationManager::GetTimerForTesting() { | 554 ModelAssociationManager::GetTimerForTesting() { |
| 554 return &timer_; | 555 return &timer_; |
| 555 } | 556 } |
| 556 | 557 |
| 557 } // namespace browser_sync | 558 } // namespace browser_sync |
| OLD | NEW |