| 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 27 matching lines...) Expand all Loading... |
| 38 syncer::EXTENSIONS, | 38 syncer::EXTENSIONS, |
| 39 syncer::APPS, | 39 syncer::APPS, |
| 40 syncer::THEMES, | 40 syncer::THEMES, |
| 41 syncer::SEARCH_ENGINES, | 41 syncer::SEARCH_ENGINES, |
| 42 syncer::SESSIONS, | 42 syncer::SESSIONS, |
| 43 syncer::APP_NOTIFICATIONS, | 43 syncer::APP_NOTIFICATIONS, |
| 44 syncer::DICTIONARY, | 44 syncer::DICTIONARY, |
| 45 syncer::FAVICON_IMAGES, | 45 syncer::FAVICON_IMAGES, |
| 46 syncer::FAVICON_TRACKING, | 46 syncer::FAVICON_TRACKING, |
| 47 syncer::MANAGED_USER_SETTINGS, | 47 syncer::MANAGED_USER_SETTINGS, |
| 48 syncer::MANAGED_USER_SHARED_SETTINGS, |
| 48 syncer::ARTICLES, | 49 syncer::ARTICLES, |
| 49 syncer::AUTOFILL, // Non-UI thread datatypes. | 50 syncer::AUTOFILL, // Non-UI thread datatypes. |
| 50 syncer::AUTOFILL_PROFILE, | 51 syncer::AUTOFILL_PROFILE, |
| 51 syncer::EXTENSION_SETTINGS, | 52 syncer::EXTENSION_SETTINGS, |
| 52 syncer::APP_SETTINGS, | 53 syncer::APP_SETTINGS, |
| 53 syncer::TYPED_URLS, | 54 syncer::TYPED_URLS, |
| 54 syncer::PASSWORDS, | 55 syncer::PASSWORDS, |
| 55 syncer::HISTORY_DELETE_DIRECTIVES, | 56 syncer::HISTORY_DELETE_DIRECTIVES, |
| 56 syncer::SYNCED_NOTIFICATIONS, | 57 syncer::SYNCED_NOTIFICATIONS, |
| 57 }; | 58 }; |
| (...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 580 } | 581 } |
| 581 return result; | 582 return result; |
| 582 } | 583 } |
| 583 | 584 |
| 584 base::OneShotTimer<ModelAssociationManager>* | 585 base::OneShotTimer<ModelAssociationManager>* |
| 585 ModelAssociationManager::GetTimerForTesting() { | 586 ModelAssociationManager::GetTimerForTesting() { |
| 586 return &timer_; | 587 return &timer_; |
| 587 } | 588 } |
| 588 | 589 |
| 589 } // namespace browser_sync | 590 } // namespace browser_sync |
| OLD | NEW |