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 | 8 |
9 #include <cstddef> | 9 #include <cstddef> |
10 #include <map> | 10 #include <map> |
(...skipping 1599 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1610 sync_driver::user_selectable_type::PREFERENCES, | 1610 sync_driver::user_selectable_type::PREFERENCES, |
1611 sync_driver::user_selectable_type::PASSWORDS, | 1611 sync_driver::user_selectable_type::PASSWORDS, |
1612 sync_driver::user_selectable_type::AUTOFILL, | 1612 sync_driver::user_selectable_type::AUTOFILL, |
1613 sync_driver::user_selectable_type::THEMES, | 1613 sync_driver::user_selectable_type::THEMES, |
1614 sync_driver::user_selectable_type::TYPED_URLS, | 1614 sync_driver::user_selectable_type::TYPED_URLS, |
1615 sync_driver::user_selectable_type::EXTENSIONS, | 1615 sync_driver::user_selectable_type::EXTENSIONS, |
1616 sync_driver::user_selectable_type::APPS, | 1616 sync_driver::user_selectable_type::APPS, |
1617 sync_driver::user_selectable_type::PROXY_TABS, | 1617 sync_driver::user_selectable_type::PROXY_TABS, |
1618 }; | 1618 }; |
1619 | 1619 |
1620 static_assert(37 == syncer::MODEL_TYPE_COUNT, | 1620 static_assert(38 == syncer::MODEL_TYPE_COUNT, |
1621 "custom config histogram must be updated"); | 1621 "custom config histogram must be updated"); |
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 |
(...skipping 899 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2530 if (--outstanding_setup_in_progress_handles_ != 0) | 2530 if (--outstanding_setup_in_progress_handles_ != 0) |
2531 return; | 2531 return; |
2532 | 2532 |
2533 DCHECK(startup_controller_->IsSetupInProgress()); | 2533 DCHECK(startup_controller_->IsSetupInProgress()); |
2534 startup_controller_->SetSetupInProgress(false); | 2534 startup_controller_->SetSetupInProgress(false); |
2535 | 2535 |
2536 if (IsBackendInitialized()) | 2536 if (IsBackendInitialized()) |
2537 ReconfigureDatatypeManager(); | 2537 ReconfigureDatatypeManager(); |
2538 NotifyObservers(); | 2538 NotifyObservers(); |
2539 } | 2539 } |
OLD | NEW |