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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 11826048: Revert 176015 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 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/chrome_extensions_activity_monitor_unittest.cc ('k') | chrome/browser/sync/test/integration/extension_settings_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/extensions/api/storage/settings_frontend.h"
9 #include "chrome/browser/extensions/app_notification_manager.h" 8 #include "chrome/browser/extensions/app_notification_manager.h"
10 #include "chrome/browser/extensions/extension_service.h" 9 #include "chrome/browser/extensions/extension_service.h"
11 #include "chrome/browser/extensions/extension_system.h" 10 #include "chrome/browser/extensions/extension_system.h"
12 #include "chrome/browser/extensions/extension_system_factory.h" 11 #include "chrome/browser/extensions/extension_system_factory.h"
12 #include "chrome/browser/extensions/settings/settings_frontend.h"
13 #include "chrome/browser/history/history.h" 13 #include "chrome/browser/history/history.h"
14 #include "chrome/browser/history/history_service_factory.h" 14 #include "chrome/browser/history/history_service_factory.h"
15 #include "chrome/browser/prefs/pref_model_associator.h" 15 #include "chrome/browser/prefs/pref_model_associator.h"
16 #include "chrome/browser/prefs/pref_service.h" 16 #include "chrome/browser/prefs/pref_service.h"
17 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/search_engines/template_url_service.h" 18 #include "chrome/browser/search_engines/template_url_service.h"
19 #include "chrome/browser/search_engines/template_url_service_factory.h" 19 #include "chrome/browser/search_engines/template_url_service_factory.h"
20 #include "chrome/browser/signin/signin_manager.h" 20 #include "chrome/browser/signin/signin_manager.h"
21 #include "chrome/browser/signin/signin_manager_factory.h" 21 #include "chrome/browser/signin/signin_manager_factory.h"
22 #include "chrome/browser/sync/glue/app_notification_data_type_controller.h" 22 #include "chrome/browser/sync/glue/app_notification_data_type_controller.h"
(...skipping 16 matching lines...) Expand all
39 #include "chrome/browser/sync/glue/session_model_associator.h" 39 #include "chrome/browser/sync/glue/session_model_associator.h"
40 #include "chrome/browser/sync/glue/shared_change_processor.h" 40 #include "chrome/browser/sync/glue/shared_change_processor.h"
41 #include "chrome/browser/sync/glue/sync_backend_host.h" 41 #include "chrome/browser/sync/glue/sync_backend_host.h"
42 #include "chrome/browser/sync/glue/theme_data_type_controller.h" 42 #include "chrome/browser/sync/glue/theme_data_type_controller.h"
43 #include "chrome/browser/sync/glue/typed_url_change_processor.h" 43 #include "chrome/browser/sync/glue/typed_url_change_processor.h"
44 #include "chrome/browser/sync/glue/typed_url_data_type_controller.h" 44 #include "chrome/browser/sync/glue/typed_url_data_type_controller.h"
45 #include "chrome/browser/sync/glue/typed_url_model_associator.h" 45 #include "chrome/browser/sync/glue/typed_url_model_associator.h"
46 #include "chrome/browser/sync/glue/ui_data_type_controller.h" 46 #include "chrome/browser/sync/glue/ui_data_type_controller.h"
47 #include "chrome/browser/sync/profile_sync_components_factory_impl.h" 47 #include "chrome/browser/sync/profile_sync_components_factory_impl.h"
48 #include "chrome/browser/sync/profile_sync_service.h" 48 #include "chrome/browser/sync/profile_sync_service.h"
49 #include "chrome/browser/themes/theme_service_factory.h"
49 #include "chrome/browser/themes/theme_service.h" 50 #include "chrome/browser/themes/theme_service.h"
50 #include "chrome/browser/themes/theme_service_factory.h"
51 #include "chrome/browser/themes/theme_syncable_service.h" 51 #include "chrome/browser/themes/theme_syncable_service.h"
52 #include "chrome/browser/webdata/autocomplete_syncable_service.h" 52 #include "chrome/browser/webdata/autocomplete_syncable_service.h"
53 #include "chrome/browser/webdata/autofill_profile_syncable_service.h" 53 #include "chrome/browser/webdata/autofill_profile_syncable_service.h"
54 #include "chrome/browser/webdata/web_data_service.h" 54 #include "chrome/browser/webdata/web_data_service.h"
55 #include "chrome/browser/webdata/web_data_service_factory.h" 55 #include "chrome/browser/webdata/web_data_service_factory.h"
56 #include "chrome/common/chrome_switches.h" 56 #include "chrome/common/chrome_switches.h"
57 #include "chrome/common/pref_names.h" 57 #include "chrome/common/pref_names.h"
58 #include "content/public/browser/browser_thread.h" 58 #include "content/public/browser/browser_thread.h"
59 #include "sync/api/syncable_service.h" 59 #include "sync/api/syncable_service.h"
60 60
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
369 ProfileSyncComponentsFactory::SyncComponents 369 ProfileSyncComponentsFactory::SyncComponents
370 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents( 370 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents(
371 ProfileSyncService* profile_sync_service, 371 ProfileSyncService* profile_sync_service,
372 DataTypeErrorHandler* error_handler) { 372 DataTypeErrorHandler* error_handler) {
373 SessionModelAssociator* model_associator = 373 SessionModelAssociator* model_associator =
374 new SessionModelAssociator(profile_sync_service, error_handler); 374 new SessionModelAssociator(profile_sync_service, error_handler);
375 SessionChangeProcessor* change_processor = 375 SessionChangeProcessor* change_processor =
376 new SessionChangeProcessor(error_handler, model_associator); 376 new SessionChangeProcessor(error_handler, model_associator);
377 return SyncComponents(model_associator, change_processor); 377 return SyncComponents(model_associator, change_processor);
378 } 378 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/glue/chrome_extensions_activity_monitor_unittest.cc ('k') | chrome/browser/sync/test/integration/extension_settings_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698