| OLD | NEW | 
|    1 // Copyright 2015 The Chromium Authors. All rights reserved. |    1 // Copyright 2015 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/chrome_sync_client.h" |    5 #include "chrome/browser/sync/chrome_sync_client.h" | 
|    6  |    6  | 
|    7 #include "base/bind.h" |    7 #include "base/bind.h" | 
|    8 #include "base/command_line.h" |    8 #include "base/command_line.h" | 
 |    9 #include "base/macros.h" | 
 |   10 #include "build/build_config.h" | 
|    9 #include "chrome/browser/autofill/personal_data_manager_factory.h" |   11 #include "chrome/browser/autofill/personal_data_manager_factory.h" | 
|   10 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |   12 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 
|   11 #include "chrome/browser/browsing_data/browsing_data_helper.h" |   13 #include "chrome/browser/browsing_data/browsing_data_helper.h" | 
|   12 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h" |   14 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h" | 
|   13 #include "chrome/browser/favicon/favicon_service_factory.h" |   15 #include "chrome/browser/favicon/favicon_service_factory.h" | 
|   14 #include "chrome/browser/history/history_service_factory.h" |   16 #include "chrome/browser/history/history_service_factory.h" | 
|   15 #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h" |   17 #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h" | 
|   16 #include "chrome/browser/password_manager/password_store_factory.h" |   18 #include "chrome/browser/password_manager/password_store_factory.h" | 
|   17 #include "chrome/browser/prefs/pref_service_syncable_util.h" |   19 #include "chrome/browser/prefs/pref_service_syncable_util.h" | 
|   18 #include "chrome/browser/profiles/profile.h" |   20 #include "chrome/browser/profiles/profile.h" | 
| (...skipping 587 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  606   sync_service->RegisterDataTypeController( |  608   sync_service->RegisterDataTypeController( | 
|  607       new SupervisedUserSyncDataTypeController(syncer::SUPERVISED_USER_SETTINGS, |  609       new SupervisedUserSyncDataTypeController(syncer::SUPERVISED_USER_SETTINGS, | 
|  608                                                error_callback, this, profile_)); |  610                                                error_callback, this, profile_)); | 
|  609   sync_service->RegisterDataTypeController( |  611   sync_service->RegisterDataTypeController( | 
|  610       new SupervisedUserSyncDataTypeController( |  612       new SupervisedUserSyncDataTypeController( | 
|  611           syncer::SUPERVISED_USER_WHITELISTS, error_callback, this, profile_)); |  613           syncer::SUPERVISED_USER_WHITELISTS, error_callback, this, profile_)); | 
|  612 #endif |  614 #endif | 
|  613 } |  615 } | 
|  614  |  616  | 
|  615 }  // namespace browser_sync |  617 }  // namespace browser_sync | 
| OLD | NEW |