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 "components/browser_sync/browser/profile_sync_service.h" | 5 #include "components/browser_sync/browser/profile_sync_service.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <cstddef> | 8 #include <cstddef> |
9 #include <map> | 9 #include <map> |
10 #include <utility> | 10 #include <utility> |
(...skipping 1587 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1598 sync_driver::user_selectable_type::PREFERENCES, | 1598 sync_driver::user_selectable_type::PREFERENCES, |
1599 sync_driver::user_selectable_type::PASSWORDS, | 1599 sync_driver::user_selectable_type::PASSWORDS, |
1600 sync_driver::user_selectable_type::AUTOFILL, | 1600 sync_driver::user_selectable_type::AUTOFILL, |
1601 sync_driver::user_selectable_type::THEMES, | 1601 sync_driver::user_selectable_type::THEMES, |
1602 sync_driver::user_selectable_type::TYPED_URLS, | 1602 sync_driver::user_selectable_type::TYPED_URLS, |
1603 sync_driver::user_selectable_type::EXTENSIONS, | 1603 sync_driver::user_selectable_type::EXTENSIONS, |
1604 sync_driver::user_selectable_type::APPS, | 1604 sync_driver::user_selectable_type::APPS, |
1605 sync_driver::user_selectable_type::PROXY_TABS, | 1605 sync_driver::user_selectable_type::PROXY_TABS, |
1606 }; | 1606 }; |
1607 | 1607 |
1608 static_assert(36 == syncer::MODEL_TYPE_COUNT, | 1608 static_assert(37 == syncer::MODEL_TYPE_COUNT, |
1609 "custom config histogram must be updated"); | 1609 "custom config histogram must be updated"); |
1610 | 1610 |
1611 if (!sync_everything) { | 1611 if (!sync_everything) { |
1612 const syncer::ModelTypeSet current_types = GetPreferredDataTypes(); | 1612 const syncer::ModelTypeSet current_types = GetPreferredDataTypes(); |
1613 | 1613 |
1614 syncer::ModelTypeSet type_set = syncer::UserSelectableTypes(); | 1614 syncer::ModelTypeSet type_set = syncer::UserSelectableTypes(); |
1615 syncer::ModelTypeSet::Iterator it = type_set.First(); | 1615 syncer::ModelTypeSet::Iterator it = type_set.First(); |
1616 | 1616 |
1617 DCHECK_EQ(arraysize(user_selectable_types), type_set.Size()); | 1617 DCHECK_EQ(arraysize(user_selectable_types), type_set.Size()); |
1618 | 1618 |
(...skipping 907 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2526 if (--outstanding_setup_in_progress_handles_ != 0) | 2526 if (--outstanding_setup_in_progress_handles_ != 0) |
2527 return; | 2527 return; |
2528 | 2528 |
2529 DCHECK(startup_controller_->IsSetupInProgress()); | 2529 DCHECK(startup_controller_->IsSetupInProgress()); |
2530 startup_controller_->SetSetupInProgress(false); | 2530 startup_controller_->SetSetupInProgress(false); |
2531 | 2531 |
2532 if (IsBackendInitialized()) | 2532 if (IsBackendInitialized()) |
2533 ReconfigureDatatypeManager(); | 2533 ReconfigureDatatypeManager(); |
2534 NotifyObservers(); | 2534 NotifyObservers(); |
2535 } | 2535 } |
OLD | NEW |