Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Side by Side Diff: chrome/browser/sync/chrome_sync_client.cc

Issue 2130453004: [Sync] Move //sync to //components/sync. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/sync/DEPS ('k') | chrome/browser/sync/glue/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 #include "components/browser_sync/browser/profile_sync_service.h" 47 #include "components/browser_sync/browser/profile_sync_service.h"
48 #include "components/browser_sync/common/browser_sync_switches.h" 48 #include "components/browser_sync/common/browser_sync_switches.h"
49 #include "components/dom_distiller/core/dom_distiller_service.h" 49 #include "components/dom_distiller/core/dom_distiller_service.h"
50 #include "components/history/core/browser/history_model_worker.h" 50 #include "components/history/core/browser/history_model_worker.h"
51 #include "components/history/core/browser/history_service.h" 51 #include "components/history/core/browser/history_service.h"
52 #include "components/invalidation/impl/profile_invalidation_provider.h" 52 #include "components/invalidation/impl/profile_invalidation_provider.h"
53 #include "components/password_manager/core/browser/password_store.h" 53 #include "components/password_manager/core/browser/password_store.h"
54 #include "components/password_manager/sync/browser/password_model_worker.h" 54 #include "components/password_manager/sync/browser/password_model_worker.h"
55 #include "components/search_engines/search_engine_data_type_controller.h" 55 #include "components/search_engines/search_engine_data_type_controller.h"
56 #include "components/signin/core/browser/profile_oauth2_token_service.h" 56 #include "components/signin/core/browser/profile_oauth2_token_service.h"
57 #include "components/sync/engine/passive_model_worker.h"
57 #include "components/sync_driver/glue/browser_thread_model_worker.h" 58 #include "components/sync_driver/glue/browser_thread_model_worker.h"
58 #include "components/sync_driver/glue/chrome_report_unrecoverable_error.h" 59 #include "components/sync_driver/glue/chrome_report_unrecoverable_error.h"
59 #include "components/sync_driver/glue/ui_model_worker.h" 60 #include "components/sync_driver/glue/ui_model_worker.h"
60 #include "components/sync_driver/sync_api_component_factory.h" 61 #include "components/sync_driver/sync_api_component_factory.h"
61 #include "components/sync_driver/sync_util.h" 62 #include "components/sync_driver/sync_util.h"
62 #include "components/sync_driver/ui_data_type_controller.h" 63 #include "components/sync_driver/ui_data_type_controller.h"
63 #include "components/sync_sessions/sync_sessions_client.h" 64 #include "components/sync_sessions/sync_sessions_client.h"
64 #include "components/syncable_prefs/pref_service_syncable.h" 65 #include "components/syncable_prefs/pref_service_syncable.h"
65 #include "content/public/browser/browser_thread.h" 66 #include "content/public/browser/browser_thread.h"
66 #include "sync/internal_api/public/engine/passive_model_worker.h"
67 #include "ui/base/device_form_factor.h" 67 #include "ui/base/device_form_factor.h"
68 68
69 #if defined(ENABLE_APP_LIST) 69 #if defined(ENABLE_APP_LIST)
70 #include "chrome/browser/ui/app_list/app_list_syncable_service.h" 70 #include "chrome/browser/ui/app_list/app_list_syncable_service.h"
71 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h" 71 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h"
72 #include "ui/app_list/app_list_switches.h" 72 #include "ui/app_list/app_list_switches.h"
73 #endif 73 #endif
74 74
75 #if defined(ENABLE_EXTENSIONS) 75 #if defined(ENABLE_EXTENSIONS)
76 #include "chrome/browser/extensions/api/storage/settings_sync_util.h" 76 #include "chrome/browser/extensions/api/storage/settings_sync_util.h"
(...skipping 543 matching lines...) Expand 10 before | Expand all | Expand 10 after
620 sync_service->RegisterDataTypeController( 620 sync_service->RegisterDataTypeController(
621 new SupervisedUserSyncDataTypeController(syncer::SUPERVISED_USER_SETTINGS, 621 new SupervisedUserSyncDataTypeController(syncer::SUPERVISED_USER_SETTINGS,
622 error_callback, this, profile_)); 622 error_callback, this, profile_));
623 sync_service->RegisterDataTypeController( 623 sync_service->RegisterDataTypeController(
624 new SupervisedUserSyncDataTypeController( 624 new SupervisedUserSyncDataTypeController(
625 syncer::SUPERVISED_USER_WHITELISTS, error_callback, this, profile_)); 625 syncer::SUPERVISED_USER_WHITELISTS, error_callback, this, profile_));
626 #endif 626 #endif
627 } 627 }
628 628
629 } // namespace browser_sync 629 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/DEPS ('k') | chrome/browser/sync/glue/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698