chrome/browser/sync/profile_sync_components_factory_impl.cc - Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable.

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

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head again, previous had unrelated broken win_rel test. Created 8 years 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/invalidations/invalidator_storage_unittest.cc ('k') | chrome/browser/sync/profile_sync_service_preference_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/app_notification_manager.h"	8 #include "chrome/browser/extensions/app_notification_manager.h"

9 #include "chrome/browser/extensions/extension_service.h"	9 #include "chrome/browser/extensions/extension_service.h"

10 #include "chrome/browser/extensions/extension_system.h"	10 #include "chrome/browser/extensions/extension_system.h"

11 #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"	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/profiles/profile.h"	17 #include "chrome/browser/profiles/profile.h"

17 #include "chrome/browser/search_engines/template_url_service.h"	18 #include "chrome/browser/search_engines/template_url_service.h"

18 #include "chrome/browser/search_engines/template_url_service_factory.h"	19 #include "chrome/browser/search_engines/template_url_service_factory.h"

19 #include "chrome/browser/signin/signin_manager.h"	20 #include "chrome/browser/signin/signin_manager.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/app_notification_data_type_controller.h"	22 #include "chrome/browser/sync/glue/app_notification_data_type_controller.h"

22 #include "chrome/browser/sync/glue/autofill_data_type_controller.h"	23 #include "chrome/browser/sync/glue/autofill_data_type_controller.h"

23 #include "chrome/browser/sync/glue/autofill_profile_data_type_controller.h"	24 #include "chrome/browser/sync/glue/autofill_profile_data_type_controller.h"

24 #include "chrome/browser/sync/glue/bookmark_change_processor.h"	25 #include "chrome/browser/sync/glue/bookmark_change_processor.h"

25 #include "chrome/browser/sync/glue/bookmark_data_type_controller.h"	26 #include "chrome/browser/sync/glue/bookmark_data_type_controller.h"

(...skipping 342 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
368 ProfileSyncComponentsFactory::SyncComponents	369 ProfileSyncComponentsFactory::SyncComponents

369 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents(	370 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents(

370 ProfileSyncService* profile_sync_service,	371 ProfileSyncService* profile_sync_service,

371 DataTypeErrorHandler* error_handler) {	372 DataTypeErrorHandler* error_handler) {

372 SessionModelAssociator* model_associator =	373 SessionModelAssociator* model_associator =

373 new SessionModelAssociator(profile_sync_service, error_handler);	374 new SessionModelAssociator(profile_sync_service, error_handler);

374 SessionChangeProcessor* change_processor =	375 SessionChangeProcessor* change_processor =

375 new SessionChangeProcessor(error_handler, model_associator);	376 new SessionChangeProcessor(error_handler, model_associator);

376 return SyncComponents(model_associator, change_processor);	377 return SyncComponents(model_associator, change_processor);

377 }	378 }

OLD	NEW