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

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

Issue 7967024: Profile shouldn't own PersonalDataManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addresses isherman #11 Created 9 years, 3 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/browser/extensions/extension_service.h" 6 #include "chrome/browser/extensions/extension_service.h"
7 #include "chrome/browser/extensions/extension_settings.h" 7 #include "chrome/browser/extensions/extension_settings.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/search_engines/template_url_service.h" 9 #include "chrome/browser/search_engines/template_url_service.h"
10 #include "chrome/browser/search_engines/template_url_service_factory.h" 10 #include "chrome/browser/search_engines/template_url_service_factory.h"
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 new browser_sync::SyncableServiceAdapter(syncable::APPS, 196 new browser_sync::SyncableServiceAdapter(syncable::APPS,
197 app_sync_service, 197 app_sync_service,
198 change_processor); 198 change_processor);
199 return SyncComponents(sync_service_adapter, change_processor); 199 return SyncComponents(sync_service_adapter, change_processor);
200 } 200 }
201 201
202 ProfileSyncFactory::SyncComponents 202 ProfileSyncFactory::SyncComponents
203 ProfileSyncFactoryImpl::CreateAutofillSyncComponents( 203 ProfileSyncFactoryImpl::CreateAutofillSyncComponents(
204 ProfileSyncService* profile_sync_service, 204 ProfileSyncService* profile_sync_service,
205 WebDatabase* web_database, 205 WebDatabase* web_database,
206 PersonalDataManager* personal_data,
207 browser_sync::UnrecoverableErrorHandler* error_handler) { 206 browser_sync::UnrecoverableErrorHandler* error_handler) {
208 207
209 AutofillModelAssociator* model_associator = 208 AutofillModelAssociator* model_associator =
210 new AutofillModelAssociator(profile_sync_service, 209 new AutofillModelAssociator(profile_sync_service,
211 web_database, 210 web_database,
212 personal_data); 211 profile_sync_service->profile());
213 AutofillChangeProcessor* change_processor = 212 AutofillChangeProcessor* change_processor =
214 new AutofillChangeProcessor(model_associator, 213 new AutofillChangeProcessor(model_associator,
215 web_database, 214 web_database,
216 personal_data, 215 profile_sync_service->profile(),
217 error_handler); 216 error_handler);
218 return SyncComponents(model_associator, change_processor); 217 return SyncComponents(model_associator, change_processor);
219 } 218 }
220 219
221 ProfileSyncFactory::SyncComponents 220 ProfileSyncFactory::SyncComponents
222 ProfileSyncFactoryImpl::CreateAutofillProfileSyncComponents( 221 ProfileSyncFactoryImpl::CreateAutofillProfileSyncComponents(
223 ProfileSyncService* profile_sync_service, 222 ProfileSyncService* profile_sync_service,
224 WebDatabase* web_database, 223 WebDatabase* web_database,
225 PersonalDataManager* personal_data,
226 browser_sync::UnrecoverableErrorHandler* error_handler) { 224 browser_sync::UnrecoverableErrorHandler* error_handler) {
227 AutofillProfileSyncableService* sync_service = 225 AutofillProfileSyncableService* sync_service =
228 new AutofillProfileSyncableService(web_database, personal_data, 226 new AutofillProfileSyncableService(web_database,
229 profile_sync_service->profile()); 227 profile_sync_service->profile());
230 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); 228 sync_api::UserShare* user_share = profile_sync_service->GetUserShare();
231 GenericChangeProcessor* change_processor = 229 GenericChangeProcessor* change_processor =
232 new GenericChangeProcessor(sync_service, error_handler, user_share); 230 new GenericChangeProcessor(sync_service, error_handler, user_share);
233 browser_sync::SyncableServiceAdapter* sync_service_adapter = 231 browser_sync::SyncableServiceAdapter* sync_service_adapter =
234 new browser_sync::SyncableServiceAdapter(syncable::AUTOFILL_PROFILE, 232 new browser_sync::SyncableServiceAdapter(syncable::AUTOFILL_PROFILE,
235 sync_service, 233 sync_service,
236 change_processor); 234 change_processor);
237 return SyncComponents(sync_service_adapter, change_processor); 235 return SyncComponents(sync_service_adapter, change_processor);
238 } 236 }
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 DCHECK(se_sync_service); 362 DCHECK(se_sync_service);
365 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); 363 sync_api::UserShare* user_share = profile_sync_service->GetUserShare();
366 GenericChangeProcessor* change_processor = 364 GenericChangeProcessor* change_processor =
367 new GenericChangeProcessor(se_sync_service, error_handler, user_share); 365 new GenericChangeProcessor(se_sync_service, error_handler, user_share);
368 SyncableServiceAdapter* sync_service_adapter = 366 SyncableServiceAdapter* sync_service_adapter =
369 new SyncableServiceAdapter(syncable::SEARCH_ENGINES, 367 new SyncableServiceAdapter(syncable::SEARCH_ENGINES,
370 se_sync_service, 368 se_sync_service,
371 change_processor); 369 change_processor);
372 return SyncComponents(sync_service_adapter, change_processor); 370 return SyncComponents(sync_service_adapter, change_processor);
373 } 371 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_factory_impl.h ('k') | chrome/browser/sync/profile_sync_factory_mock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698