| 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 1600 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1611 browser_sync::user_selectable_type::PREFERENCES, | 1611 browser_sync::user_selectable_type::PREFERENCES, |
| 1612 browser_sync::user_selectable_type::PASSWORDS, | 1612 browser_sync::user_selectable_type::PASSWORDS, |
| 1613 browser_sync::user_selectable_type::AUTOFILL, | 1613 browser_sync::user_selectable_type::AUTOFILL, |
| 1614 browser_sync::user_selectable_type::THEMES, | 1614 browser_sync::user_selectable_type::THEMES, |
| 1615 browser_sync::user_selectable_type::TYPED_URLS, | 1615 browser_sync::user_selectable_type::TYPED_URLS, |
| 1616 browser_sync::user_selectable_type::EXTENSIONS, | 1616 browser_sync::user_selectable_type::EXTENSIONS, |
| 1617 browser_sync::user_selectable_type::APPS, | 1617 browser_sync::user_selectable_type::APPS, |
| 1618 browser_sync::user_selectable_type::PROXY_TABS | 1618 browser_sync::user_selectable_type::PROXY_TABS |
| 1619 }; | 1619 }; |
| 1620 | 1620 |
| 1621 COMPILE_ASSERT(30 == syncer::MODEL_TYPE_COUNT, UpdateCustomConfigHistogram); | 1621 COMPILE_ASSERT(31 == syncer::MODEL_TYPE_COUNT, UpdateCustomConfigHistogram); |
| 1622 | 1622 |
| 1623 if (!sync_everything) { | 1623 if (!sync_everything) { |
| 1624 const syncer::ModelTypeSet current_types = GetPreferredDataTypes(); | 1624 const syncer::ModelTypeSet current_types = GetPreferredDataTypes(); |
| 1625 | 1625 |
| 1626 syncer::ModelTypeSet type_set = syncer::UserSelectableTypes(); | 1626 syncer::ModelTypeSet type_set = syncer::UserSelectableTypes(); |
| 1627 syncer::ModelTypeSet::Iterator it = type_set.First(); | 1627 syncer::ModelTypeSet::Iterator it = type_set.First(); |
| 1628 | 1628 |
| 1629 DCHECK_EQ(arraysize(user_selectable_types), type_set.Size()); | 1629 DCHECK_EQ(arraysize(user_selectable_types), type_set.Size()); |
| 1630 | 1630 |
| 1631 for (size_t i = 0; i < arraysize(user_selectable_types) && it.Good(); | 1631 for (size_t i = 0; i < arraysize(user_selectable_types) && it.Good(); |
| (...skipping 634 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2266 status.last_get_token_error = last_get_token_error_; | 2266 status.last_get_token_error = last_get_token_error_; |
| 2267 if (request_access_token_retry_timer_.IsRunning()) | 2267 if (request_access_token_retry_timer_.IsRunning()) |
| 2268 status.next_token_request_time = next_token_request_time_; | 2268 status.next_token_request_time = next_token_request_time_; |
| 2269 return status; | 2269 return status; |
| 2270 } | 2270 } |
| 2271 | 2271 |
| 2272 void ProfileSyncService::OverrideNetworkResourcesForTest( | 2272 void ProfileSyncService::OverrideNetworkResourcesForTest( |
| 2273 scoped_ptr<syncer::NetworkResources> network_resources) { | 2273 scoped_ptr<syncer::NetworkResources> network_resources) { |
| 2274 network_resources_ = network_resources.Pass(); | 2274 network_resources_ = network_resources.Pass(); |
| 2275 } | 2275 } |
| OLD | NEW |