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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1433473007: [NOT FOR REVIEW] Copy of Max's CL with conflicts fixed (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pss_strings
Patch Set: Created 5 years, 1 month 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/glue/sync_backend_host_mock.cc ('k') | chrome/browser/sync/profile_sync_service.h » ('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 (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 "chrome/browser/sync/profile_sync_components_factory_impl.h" 5 #include "chrome/browser/sync/profile_sync_components_factory_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
11 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 11 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/search_engines/template_url_service_factory.h" 13 #include "chrome/browser/search_engines/template_url_service_factory.h"
14 #include "chrome/browser/sync/glue/sync_backend_host.h"
15 #include "chrome/browser/sync/glue/sync_backend_host_impl.h"
16 #include "chrome/browser/sync/glue/theme_data_type_controller.h" 14 #include "chrome/browser/sync/glue/theme_data_type_controller.h"
17 #include "chrome/browser/sync/profile_sync_service.h" 15 #include "chrome/browser/sync/profile_sync_service.h"
18 #include "chrome/common/channel_info.h" 16 #include "chrome/common/channel_info.h"
19 #include "chrome/common/chrome_switches.h" 17 #include "chrome/common/chrome_switches.h"
20 #include "chrome/common/pref_names.h" 18 #include "chrome/common/pref_names.h"
21 #include "components/autofill/core/browser/autofill_wallet_data_type_controller. h" 19 #include "components/autofill/core/browser/autofill_wallet_data_type_controller. h"
22 #include "components/autofill/core/browser/webdata/autofill_data_type_controller .h" 20 #include "components/autofill/core/browser/webdata/autofill_data_type_controller .h"
23 #include "components/autofill/core/browser/webdata/autofill_profile_data_type_co ntroller.h" 21 #include "components/autofill/core/browser/webdata/autofill_profile_data_type_co ntroller.h"
24 #include "components/autofill/core/common/autofill_pref_names.h" 22 #include "components/autofill/core/common/autofill_pref_names.h"
25 #include "components/autofill/core/common/autofill_switches.h" 23 #include "components/autofill/core/common/autofill_switches.h"
26 #include "components/browser_sync/common/browser_sync_switches.h" 24 #include "components/browser_sync/common/browser_sync_switches.h"
27 #include "components/dom_distiller/core/dom_distiller_features.h" 25 #include "components/dom_distiller/core/dom_distiller_features.h"
28 #include "components/history/core/browser/history_delete_directives_data_type_co ntroller.h" 26 #include "components/history/core/browser/history_delete_directives_data_type_co ntroller.h"
29 #include "components/history/core/browser/typed_url_change_processor.h" 27 #include "components/history/core/browser/typed_url_change_processor.h"
30 #include "components/history/core/browser/typed_url_data_type_controller.h" 28 #include "components/history/core/browser/typed_url_data_type_controller.h"
31 #include "components/history/core/browser/typed_url_model_associator.h" 29 #include "components/history/core/browser/typed_url_model_associator.h"
32 #include "components/password_manager/sync/browser/password_data_type_controller .h" 30 #include "components/password_manager/sync/browser/password_data_type_controller .h"
33 #include "components/search_engines/search_engine_data_type_controller.h" 31 #include "components/search_engines/search_engine_data_type_controller.h"
34 #include "components/sync_bookmarks/bookmark_change_processor.h" 32 #include "components/sync_bookmarks/bookmark_change_processor.h"
35 #include "components/sync_bookmarks/bookmark_data_type_controller.h" 33 #include "components/sync_bookmarks/bookmark_data_type_controller.h"
36 #include "components/sync_bookmarks/bookmark_model_associator.h" 34 #include "components/sync_bookmarks/bookmark_model_associator.h"
37 #include "components/sync_driver/data_type_manager_impl.h" 35 #include "components/sync_driver/data_type_manager_impl.h"
38 #include "components/sync_driver/device_info_data_type_controller.h" 36 #include "components/sync_driver/device_info_data_type_controller.h"
39 #include "components/sync_driver/glue/chrome_report_unrecoverable_error.h" 37 #include "components/sync_driver/glue/chrome_report_unrecoverable_error.h"
38 #include "components/sync_driver/glue/sync_backend_host.h"
39 #include "components/sync_driver/glue/sync_backend_host_impl.h"
40 #include "components/sync_driver/local_device_info_provider_impl.h" 40 #include "components/sync_driver/local_device_info_provider_impl.h"
41 #include "components/sync_driver/proxy_data_type_controller.h" 41 #include "components/sync_driver/proxy_data_type_controller.h"
42 #include "components/sync_driver/sync_client.h" 42 #include "components/sync_driver/sync_client.h"
43 #include "components/sync_driver/ui_data_type_controller.h" 43 #include "components/sync_driver/ui_data_type_controller.h"
44 #include "components/sync_sessions/session_data_type_controller.h" 44 #include "components/sync_sessions/session_data_type_controller.h"
45 #include "components/variations/variations_associated_data.h" 45 #include "components/variations/variations_associated_data.h"
46 #include "content/public/browser/browser_thread.h" 46 #include "content/public/browser/browser_thread.h"
47 #include "google_apis/gaia/oauth2_token_service.h" 47 #include "google_apis/gaia/oauth2_token_service.h"
48 #include "google_apis/gaia/oauth2_token_service_request.h" 48 #include "google_apis/gaia/oauth2_token_service_request.h"
49 #include "net/url_request/url_request_context_getter.h" 49 #include "net/url_request/url_request_context_getter.h"
(...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after
553 // |sync_service_| member, and make GetSyncService require it be called on 553 // |sync_service_| member, and make GetSyncService require it be called on
554 // the UI thread. 554 // the UI thread.
555 TypedUrlModelAssociator* model_associator = 555 TypedUrlModelAssociator* model_associator =
556 new TypedUrlModelAssociator(sync_service, 556 new TypedUrlModelAssociator(sync_service,
557 history_backend, 557 history_backend,
558 error_handler); 558 error_handler);
559 TypedUrlChangeProcessor* change_processor = new TypedUrlChangeProcessor( 559 TypedUrlChangeProcessor* change_processor = new TypedUrlChangeProcessor(
560 model_associator, history_backend, error_handler, ui_thread); 560 model_associator, history_backend, error_handler, ui_thread);
561 return SyncComponents(model_associator, change_processor); 561 return SyncComponents(model_associator, change_processor);
562 } 562 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/glue/sync_backend_host_mock.cc ('k') | chrome/browser/sync/profile_sync_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698