| 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 <set> | 9 #include <set> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 1584 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1595 browser_sync::user_selectable_type::PREFERENCES, | 1595 browser_sync::user_selectable_type::PREFERENCES, |
| 1596 browser_sync::user_selectable_type::PASSWORDS, | 1596 browser_sync::user_selectable_type::PASSWORDS, |
| 1597 browser_sync::user_selectable_type::AUTOFILL, | 1597 browser_sync::user_selectable_type::AUTOFILL, |
| 1598 browser_sync::user_selectable_type::THEMES, | 1598 browser_sync::user_selectable_type::THEMES, |
| 1599 browser_sync::user_selectable_type::TYPED_URLS, | 1599 browser_sync::user_selectable_type::TYPED_URLS, |
| 1600 browser_sync::user_selectable_type::EXTENSIONS, | 1600 browser_sync::user_selectable_type::EXTENSIONS, |
| 1601 browser_sync::user_selectable_type::APPS, | 1601 browser_sync::user_selectable_type::APPS, |
| 1602 browser_sync::user_selectable_type::PROXY_TABS | 1602 browser_sync::user_selectable_type::PROXY_TABS |
| 1603 }; | 1603 }; |
| 1604 | 1604 |
| 1605 COMPILE_ASSERT(31 == syncer::MODEL_TYPE_COUNT, UpdateCustomConfigHistogram); | 1605 COMPILE_ASSERT(32 == syncer::MODEL_TYPE_COUNT, UpdateCustomConfigHistogram); |
| 1606 | 1606 |
| 1607 if (!sync_everything) { | 1607 if (!sync_everything) { |
| 1608 const syncer::ModelTypeSet current_types = GetPreferredDataTypes(); | 1608 const syncer::ModelTypeSet current_types = GetPreferredDataTypes(); |
| 1609 | 1609 |
| 1610 syncer::ModelTypeSet type_set = syncer::UserSelectableTypes(); | 1610 syncer::ModelTypeSet type_set = syncer::UserSelectableTypes(); |
| 1611 syncer::ModelTypeSet::Iterator it = type_set.First(); | 1611 syncer::ModelTypeSet::Iterator it = type_set.First(); |
| 1612 | 1612 |
| 1613 DCHECK_EQ(arraysize(user_selectable_types), type_set.Size()); | 1613 DCHECK_EQ(arraysize(user_selectable_types), type_set.Size()); |
| 1614 | 1614 |
| 1615 for (size_t i = 0; i < arraysize(user_selectable_types) && it.Good(); | 1615 for (size_t i = 0; i < arraysize(user_selectable_types) && it.Good(); |
| (...skipping 635 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2251 status.last_get_token_error = last_get_token_error_; | 2251 status.last_get_token_error = last_get_token_error_; |
| 2252 if (request_access_token_retry_timer_.IsRunning()) | 2252 if (request_access_token_retry_timer_.IsRunning()) |
| 2253 status.next_token_request_time = next_token_request_time_; | 2253 status.next_token_request_time = next_token_request_time_; |
| 2254 return status; | 2254 return status; |
| 2255 } | 2255 } |
| 2256 | 2256 |
| 2257 void ProfileSyncService::OverrideNetworkResourcesForTest( | 2257 void ProfileSyncService::OverrideNetworkResourcesForTest( |
| 2258 scoped_ptr<syncer::NetworkResources> network_resources) { | 2258 scoped_ptr<syncer::NetworkResources> network_resources) { |
| 2259 network_resources_ = network_resources.Pass(); | 2259 network_resources_ = network_resources.Pass(); |
| 2260 } | 2260 } |
| OLD | NEW |