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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 368273011: Revert of Componentize TemplateURLService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/sync/glue/search_engine_data_type_controller.h ('k') | chrome/browser/sync/test/integration/search_engines_helper.cc » ('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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "build/build_config.h" 6 #include "build/build_config.h"
7 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 7 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
8 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h" 8 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h"
9 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h" 9 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h"
10 #include "chrome/browser/history/history_service.h" 10 #include "chrome/browser/history/history_service.h"
11 #include "chrome/browser/history/history_service_factory.h" 11 #include "chrome/browser/history/history_service_factory.h"
12 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service.h" 12 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service.h"
13 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service_fac tory.h" 13 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service_fac tory.h"
14 #include "chrome/browser/password_manager/password_store_factory.h" 14 #include "chrome/browser/password_manager/password_store_factory.h"
15 #include "chrome/browser/pref_service_flags_storage.h" 15 #include "chrome/browser/pref_service_flags_storage.h"
16 #include "chrome/browser/prefs/pref_model_associator.h" 16 #include "chrome/browser/prefs/pref_model_associator.h"
17 #include "chrome/browser/prefs/pref_service_syncable.h" 17 #include "chrome/browser/prefs/pref_service_syncable.h"
18 #include "chrome/browser/profiles/profile.h" 18 #include "chrome/browser/profiles/profile.h"
19 #include "chrome/browser/search_engines/template_url_service.h"
19 #include "chrome/browser/search_engines/template_url_service_factory.h" 20 #include "chrome/browser/search_engines/template_url_service_factory.h"
20 #include "chrome/browser/signin/signin_manager_factory.h" 21 #include "chrome/browser/signin/signin_manager_factory.h"
21 #include "chrome/browser/sync/glue/autofill_data_type_controller.h" 22 #include "chrome/browser/sync/glue/autofill_data_type_controller.h"
22 #include "chrome/browser/sync/glue/autofill_profile_data_type_controller.h" 23 #include "chrome/browser/sync/glue/autofill_profile_data_type_controller.h"
23 #include "chrome/browser/sync/glue/bookmark_change_processor.h" 24 #include "chrome/browser/sync/glue/bookmark_change_processor.h"
24 #include "chrome/browser/sync/glue/bookmark_data_type_controller.h" 25 #include "chrome/browser/sync/glue/bookmark_data_type_controller.h"
25 #include "chrome/browser/sync/glue/bookmark_model_associator.h" 26 #include "chrome/browser/sync/glue/bookmark_model_associator.h"
26 #include "chrome/browser/sync/glue/chrome_report_unrecoverable_error.h" 27 #include "chrome/browser/sync/glue/chrome_report_unrecoverable_error.h"
27 #include "chrome/browser/sync/glue/extension_backed_data_type_controller.h" 28 #include "chrome/browser/sync/glue/extension_backed_data_type_controller.h"
28 #include "chrome/browser/sync/glue/extension_data_type_controller.h" 29 #include "chrome/browser/sync/glue/extension_data_type_controller.h"
(...skipping 15 matching lines...) Expand all
44 #include "chrome/browser/themes/theme_syncable_service.h" 45 #include "chrome/browser/themes/theme_syncable_service.h"
45 #include "chrome/browser/webdata/autocomplete_syncable_service.h" 46 #include "chrome/browser/webdata/autocomplete_syncable_service.h"
46 #include "chrome/browser/webdata/web_data_service_factory.h" 47 #include "chrome/browser/webdata/web_data_service_factory.h"
47 #include "chrome/common/chrome_switches.h" 48 #include "chrome/common/chrome_switches.h"
48 #include "chrome/common/chrome_version_info.h" 49 #include "chrome/common/chrome_version_info.h"
49 #include "chrome/common/pref_names.h" 50 #include "chrome/common/pref_names.h"
50 #include "components/autofill/core/browser/webdata/autofill_profile_syncable_ser vice.h" 51 #include "components/autofill/core/browser/webdata/autofill_profile_syncable_ser vice.h"
51 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h" 52 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
52 #include "components/dom_distiller/core/dom_distiller_service.h" 53 #include "components/dom_distiller/core/dom_distiller_service.h"
53 #include "components/password_manager/core/browser/password_store.h" 54 #include "components/password_manager/core/browser/password_store.h"
54 #include "components/search_engines/template_url_service.h"
55 #include "components/signin/core/browser/signin_manager.h" 55 #include "components/signin/core/browser/signin_manager.h"
56 #include "components/sync_driver/data_type_manager_impl.h" 56 #include "components/sync_driver/data_type_manager_impl.h"
57 #include "components/sync_driver/data_type_manager_observer.h" 57 #include "components/sync_driver/data_type_manager_observer.h"
58 #include "components/sync_driver/generic_change_processor.h" 58 #include "components/sync_driver/generic_change_processor.h"
59 #include "components/sync_driver/proxy_data_type_controller.h" 59 #include "components/sync_driver/proxy_data_type_controller.h"
60 #include "components/sync_driver/shared_change_processor.h" 60 #include "components/sync_driver/shared_change_processor.h"
61 #include "components/sync_driver/ui_data_type_controller.h" 61 #include "components/sync_driver/ui_data_type_controller.h"
62 #include "content/public/browser/browser_thread.h" 62 #include "content/public/browser/browser_thread.h"
63 #include "extensions/browser/extension_system.h" 63 #include "extensions/browser/extension_system.h"
64 #include "google_apis/gaia/oauth2_token_service_request.h" 64 #include "google_apis/gaia/oauth2_token_service_request.h"
(...skipping 642 matching lines...) Expand 10 before | Expand all | Expand 10 after
707 new TypedUrlModelAssociator(profile_sync_service, 707 new TypedUrlModelAssociator(profile_sync_service,
708 history_backend, 708 history_backend,
709 error_handler); 709 error_handler);
710 TypedUrlChangeProcessor* change_processor = 710 TypedUrlChangeProcessor* change_processor =
711 new TypedUrlChangeProcessor(profile_, 711 new TypedUrlChangeProcessor(profile_,
712 model_associator, 712 model_associator,
713 history_backend, 713 history_backend,
714 error_handler); 714 error_handler);
715 return SyncComponents(model_associator, change_processor); 715 return SyncComponents(model_associator, change_processor);
716 } 716 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/glue/search_engine_data_type_controller.h ('k') | chrome/browser/sync/test/integration/search_engines_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698