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

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

Issue 17392006: In components/autofill, move browser/ to core/browser/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to fix conflicts Created 7 years, 6 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
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" 8 #include "chrome/browser/extensions/api/storage/settings_frontend.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"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 #include "chrome/browser/sync/profile_sync_components_factory_impl.h" 48 #include "chrome/browser/sync/profile_sync_components_factory_impl.h"
49 #include "chrome/browser/sync/profile_sync_service.h" 49 #include "chrome/browser/sync/profile_sync_service.h"
50 #include "chrome/browser/sync/profile_sync_service_factory.h" 50 #include "chrome/browser/sync/profile_sync_service_factory.h"
51 #include "chrome/browser/themes/theme_service.h" 51 #include "chrome/browser/themes/theme_service.h"
52 #include "chrome/browser/themes/theme_service_factory.h" 52 #include "chrome/browser/themes/theme_service_factory.h"
53 #include "chrome/browser/themes/theme_syncable_service.h" 53 #include "chrome/browser/themes/theme_syncable_service.h"
54 #include "chrome/browser/webdata/autocomplete_syncable_service.h" 54 #include "chrome/browser/webdata/autocomplete_syncable_service.h"
55 #include "chrome/browser/webdata/autofill_profile_syncable_service.h" 55 #include "chrome/browser/webdata/autofill_profile_syncable_service.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 "components/autofill/browser/webdata/autofill_webdata_service.h" 58 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
59 #include "content/public/browser/browser_thread.h" 59 #include "content/public/browser/browser_thread.h"
60 #include "sync/api/syncable_service.h" 60 #include "sync/api/syncable_service.h"
61 61
62 #if defined(ENABLE_MANAGED_USERS) 62 #if defined(ENABLE_MANAGED_USERS)
63 #include "chrome/browser/managed_mode/managed_user_registration_service.h" 63 #include "chrome/browser/managed_mode/managed_user_registration_service.h"
64 #include "chrome/browser/managed_mode/managed_user_registration_service_factory. h" 64 #include "chrome/browser/managed_mode/managed_user_registration_service_factory. h"
65 #include "chrome/browser/managed_mode/managed_user_service.h" 65 #include "chrome/browser/managed_mode/managed_user_service.h"
66 #include "chrome/browser/policy/managed_mode_policy_provider.h" 66 #include "chrome/browser/policy/managed_mode_policy_provider.h"
67 #include "chrome/browser/policy/profile_policy_connector.h" 67 #include "chrome/browser/policy/profile_policy_connector.h"
68 #include "chrome/browser/policy/profile_policy_connector_factory.h" 68 #include "chrome/browser/policy/profile_policy_connector_factory.h"
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 ProfileSyncComponentsFactory::SyncComponents 474 ProfileSyncComponentsFactory::SyncComponents
475 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents( 475 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents(
476 ProfileSyncService* profile_sync_service, 476 ProfileSyncService* profile_sync_service,
477 DataTypeErrorHandler* error_handler) { 477 DataTypeErrorHandler* error_handler) {
478 SessionModelAssociator* model_associator = 478 SessionModelAssociator* model_associator =
479 new SessionModelAssociator(profile_sync_service, error_handler); 479 new SessionModelAssociator(profile_sync_service, error_handler);
480 SessionChangeProcessor* change_processor = 480 SessionChangeProcessor* change_processor =
481 new SessionChangeProcessor(error_handler, model_associator); 481 new SessionChangeProcessor(error_handler, model_associator);
482 return SyncComponents(model_associator, change_processor); 482 return SyncComponents(model_associator, change_processor);
483 } 483 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698