| 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 1396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1407 browser_sync::user_selectable_type::PREFERENCES, | 1407 browser_sync::user_selectable_type::PREFERENCES, |
| 1408 browser_sync::user_selectable_type::PASSWORDS, | 1408 browser_sync::user_selectable_type::PASSWORDS, |
| 1409 browser_sync::user_selectable_type::AUTOFILL, | 1409 browser_sync::user_selectable_type::AUTOFILL, |
| 1410 browser_sync::user_selectable_type::THEMES, | 1410 browser_sync::user_selectable_type::THEMES, |
| 1411 browser_sync::user_selectable_type::TYPED_URLS, | 1411 browser_sync::user_selectable_type::TYPED_URLS, |
| 1412 browser_sync::user_selectable_type::EXTENSIONS, | 1412 browser_sync::user_selectable_type::EXTENSIONS, |
| 1413 browser_sync::user_selectable_type::APPS, | 1413 browser_sync::user_selectable_type::APPS, |
| 1414 browser_sync::user_selectable_type::PROXY_TABS | 1414 browser_sync::user_selectable_type::PROXY_TABS |
| 1415 }; | 1415 }; |
| 1416 | 1416 |
| 1417 COMPILE_ASSERT(26 == syncer::MODEL_TYPE_COUNT, UpdateCustomConfigHistogram); | 1417 COMPILE_ASSERT(27 == syncer::MODEL_TYPE_COUNT, UpdateCustomConfigHistogram); |
| 1418 | 1418 |
| 1419 if (!sync_everything) { | 1419 if (!sync_everything) { |
| 1420 const syncer::ModelTypeSet current_types = GetPreferredDataTypes(); | 1420 const syncer::ModelTypeSet current_types = GetPreferredDataTypes(); |
| 1421 | 1421 |
| 1422 syncer::ModelTypeSet type_set = syncer::UserSelectableTypes(); | 1422 syncer::ModelTypeSet type_set = syncer::UserSelectableTypes(); |
| 1423 syncer::ModelTypeSet::Iterator it = type_set.First(); | 1423 syncer::ModelTypeSet::Iterator it = type_set.First(); |
| 1424 | 1424 |
| 1425 DCHECK_EQ(arraysize(user_selectable_types), type_set.Size()); | 1425 DCHECK_EQ(arraysize(user_selectable_types), type_set.Size()); |
| 1426 | 1426 |
| 1427 for (size_t i = 0; i < arraysize(user_selectable_types) && it.Good(); | 1427 for (size_t i = 0; i < arraysize(user_selectable_types) && it.Good(); |
| (...skipping 627 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2055 // See http://stackoverflow.com/questions/6224121/is-new-this-myclass-undefine
d-behaviour-after-directly-calling-the-destru. | 2055 // See http://stackoverflow.com/questions/6224121/is-new-this-myclass-undefine
d-behaviour-after-directly-calling-the-destru. |
| 2056 ProfileSyncService* old_this = this; | 2056 ProfileSyncService* old_this = this; |
| 2057 this->~ProfileSyncService(); | 2057 this->~ProfileSyncService(); |
| 2058 new(old_this) ProfileSyncService( | 2058 new(old_this) ProfileSyncService( |
| 2059 new ProfileSyncComponentsFactoryImpl(profile, | 2059 new ProfileSyncComponentsFactoryImpl(profile, |
| 2060 CommandLine::ForCurrentProcess()), | 2060 CommandLine::ForCurrentProcess()), |
| 2061 profile, | 2061 profile, |
| 2062 signin, | 2062 signin, |
| 2063 behavior); | 2063 behavior); |
| 2064 } | 2064 } |
| OLD | NEW |