| 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/profile_sync_service.h" |     5 #include "components/browser_sync/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 1641 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1652   const syncer::user_selectable_type::UserSelectableSyncType |  1652   const syncer::user_selectable_type::UserSelectableSyncType | 
|  1653       user_selectable_types[] = { |  1653       user_selectable_types[] = { | 
|  1654           syncer::user_selectable_type::BOOKMARKS, |  1654           syncer::user_selectable_type::BOOKMARKS, | 
|  1655           syncer::user_selectable_type::PREFERENCES, |  1655           syncer::user_selectable_type::PREFERENCES, | 
|  1656           syncer::user_selectable_type::PASSWORDS, |  1656           syncer::user_selectable_type::PASSWORDS, | 
|  1657           syncer::user_selectable_type::AUTOFILL, |  1657           syncer::user_selectable_type::AUTOFILL, | 
|  1658           syncer::user_selectable_type::THEMES, |  1658           syncer::user_selectable_type::THEMES, | 
|  1659           syncer::user_selectable_type::TYPED_URLS, |  1659           syncer::user_selectable_type::TYPED_URLS, | 
|  1660           syncer::user_selectable_type::EXTENSIONS, |  1660           syncer::user_selectable_type::EXTENSIONS, | 
|  1661           syncer::user_selectable_type::APPS, |  1661           syncer::user_selectable_type::APPS, | 
 |  1662           syncer::user_selectable_type::READING_LIST, | 
|  1662           syncer::user_selectable_type::PROXY_TABS, |  1663           syncer::user_selectable_type::PROXY_TABS, | 
|  1663       }; |  1664       }; | 
|  1664  |  1665  | 
|  1665   static_assert(39 == syncer::MODEL_TYPE_COUNT, |  1666   static_assert(39 == syncer::MODEL_TYPE_COUNT, | 
|  1666                 "custom config histogram must be updated"); |  1667                 "custom config histogram must be updated"); | 
|  1667  |  1668  | 
|  1668   if (!sync_everything) { |  1669   if (!sync_everything) { | 
|  1669     const syncer::ModelTypeSet current_types = GetPreferredDataTypes(); |  1670     const syncer::ModelTypeSet current_types = GetPreferredDataTypes(); | 
|  1670  |  1671  | 
|  1671     syncer::ModelTypeSet type_set = syncer::UserSelectableTypes(); |  1672     syncer::ModelTypeSet type_set = syncer::UserSelectableTypes(); | 
| (...skipping 972 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  2644  |  2645  | 
|  2645   DCHECK(startup_controller_->IsSetupInProgress()); |  2646   DCHECK(startup_controller_->IsSetupInProgress()); | 
|  2646   startup_controller_->SetSetupInProgress(false); |  2647   startup_controller_->SetSetupInProgress(false); | 
|  2647  |  2648  | 
|  2648   if (IsBackendInitialized()) |  2649   if (IsBackendInitialized()) | 
|  2649     ReconfigureDatatypeManager(); |  2650     ReconfigureDatatypeManager(); | 
|  2650   NotifyObservers(); |  2651   NotifyObservers(); | 
|  2651 } |  2652 } | 
|  2652  |  2653  | 
|  2653 }  // namespace browser_sync |  2654 }  // namespace browser_sync | 
| OLD | NEW |