| 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/profile_sync_service.h" | 5 #include "chrome/browser/sync/profile_sync_service.h" |
| 6 | 6 |
| 7 #include <cstddef> | 7 #include <cstddef> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 1722 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1733 sync_driver::user_selectable_type::PASSWORDS, | 1733 sync_driver::user_selectable_type::PASSWORDS, |
| 1734 sync_driver::user_selectable_type::AUTOFILL, | 1734 sync_driver::user_selectable_type::AUTOFILL, |
| 1735 sync_driver::user_selectable_type::THEMES, | 1735 sync_driver::user_selectable_type::THEMES, |
| 1736 sync_driver::user_selectable_type::TYPED_URLS, | 1736 sync_driver::user_selectable_type::TYPED_URLS, |
| 1737 sync_driver::user_selectable_type::EXTENSIONS, | 1737 sync_driver::user_selectable_type::EXTENSIONS, |
| 1738 sync_driver::user_selectable_type::APPS, | 1738 sync_driver::user_selectable_type::APPS, |
| 1739 sync_driver::user_selectable_type::WIFI_CREDENTIAL, | 1739 sync_driver::user_selectable_type::WIFI_CREDENTIAL, |
| 1740 sync_driver::user_selectable_type::PROXY_TABS, | 1740 sync_driver::user_selectable_type::PROXY_TABS, |
| 1741 }; | 1741 }; |
| 1742 | 1742 |
| 1743 COMPILE_ASSERT(33 == syncer::MODEL_TYPE_COUNT, UpdateCustomConfigHistogram); | 1743 COMPILE_ASSERT(34 == syncer::MODEL_TYPE_COUNT, UpdateCustomConfigHistogram); |
| 1744 | 1744 |
| 1745 if (!sync_everything) { | 1745 if (!sync_everything) { |
| 1746 const syncer::ModelTypeSet current_types = GetPreferredDataTypes(); | 1746 const syncer::ModelTypeSet current_types = GetPreferredDataTypes(); |
| 1747 | 1747 |
| 1748 syncer::ModelTypeSet type_set = syncer::UserSelectableTypes(); | 1748 syncer::ModelTypeSet type_set = syncer::UserSelectableTypes(); |
| 1749 syncer::ModelTypeSet::Iterator it = type_set.First(); | 1749 syncer::ModelTypeSet::Iterator it = type_set.First(); |
| 1750 | 1750 |
| 1751 DCHECK_EQ(arraysize(user_selectable_types), type_set.Size()); | 1751 DCHECK_EQ(arraysize(user_selectable_types), type_set.Size()); |
| 1752 | 1752 |
| 1753 for (size_t i = 0; i < arraysize(user_selectable_types) && it.Good(); | 1753 for (size_t i = 0; i < arraysize(user_selectable_types) && it.Good(); |
| (...skipping 985 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2739 | 2739 |
| 2740 base::MessageLoop* ProfileSyncService::GetSyncLoopForTest() const { | 2740 base::MessageLoop* ProfileSyncService::GetSyncLoopForTest() const { |
| 2741 if (sync_thread_) { | 2741 if (sync_thread_) { |
| 2742 return sync_thread_->message_loop(); | 2742 return sync_thread_->message_loop(); |
| 2743 } else if (backend_) { | 2743 } else if (backend_) { |
| 2744 return backend_->GetSyncLoopForTesting(); | 2744 return backend_->GetSyncLoopForTesting(); |
| 2745 } else { | 2745 } else { |
| 2746 return NULL; | 2746 return NULL; |
| 2747 } | 2747 } |
| 2748 } | 2748 } |
| OLD | NEW |