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

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

Issue 12891006: bookmarks: Remove Profile getter accessor from BookmarkModel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cocoa alignments Created 7 years, 9 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/api/webdata/autofill_web_data_service.h" 7 #include "chrome/browser/api/webdata/autofill_web_data_service.h"
8 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 8 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
9 #include "chrome/browser/extensions/api/storage/settings_frontend.h" 9 #include "chrome/browser/extensions/api/storage/settings_frontend.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 BookmarkModelFactory::GetForProfile(profile_sync_service->profile()); 367 BookmarkModelFactory::GetForProfile(profile_sync_service->profile());
368 syncer::UserShare* user_share = profile_sync_service->GetUserShare(); 368 syncer::UserShare* user_share = profile_sync_service->GetUserShare();
369 // TODO(akalin): We may want to propagate this switch up eventually. 369 // TODO(akalin): We may want to propagate this switch up eventually.
370 #if defined(OS_ANDROID) 370 #if defined(OS_ANDROID)
371 const bool kExpectMobileBookmarksFolder = true; 371 const bool kExpectMobileBookmarksFolder = true;
372 #else 372 #else
373 const bool kExpectMobileBookmarksFolder = false; 373 const bool kExpectMobileBookmarksFolder = false;
374 #endif 374 #endif
375 BookmarkModelAssociator* model_associator = 375 BookmarkModelAssociator* model_associator =
376 new BookmarkModelAssociator(bookmark_model, 376 new BookmarkModelAssociator(bookmark_model,
377 profile_sync_service->profile(),
377 user_share, 378 user_share,
378 error_handler, 379 error_handler,
379 kExpectMobileBookmarksFolder); 380 kExpectMobileBookmarksFolder);
380 BookmarkChangeProcessor* change_processor = 381 BookmarkChangeProcessor* change_processor =
381 new BookmarkChangeProcessor(model_associator, 382 new BookmarkChangeProcessor(model_associator,
382 error_handler); 383 error_handler);
383 return SyncComponents(model_associator, change_processor); 384 return SyncComponents(model_associator, change_processor);
384 } 385 }
385 386
386 ProfileSyncComponentsFactory::SyncComponents 387 ProfileSyncComponentsFactory::SyncComponents
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 ProfileSyncComponentsFactory::SyncComponents 420 ProfileSyncComponentsFactory::SyncComponents
420 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents( 421 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents(
421 ProfileSyncService* profile_sync_service, 422 ProfileSyncService* profile_sync_service,
422 DataTypeErrorHandler* error_handler) { 423 DataTypeErrorHandler* error_handler) {
423 SessionModelAssociator* model_associator = 424 SessionModelAssociator* model_associator =
424 new SessionModelAssociator(profile_sync_service, error_handler); 425 new SessionModelAssociator(profile_sync_service, error_handler);
425 SessionChangeProcessor* change_processor = 426 SessionChangeProcessor* change_processor =
426 new SessionChangeProcessor(error_handler, model_associator); 427 new SessionChangeProcessor(error_handler, model_associator);
427 return SyncComponents(model_associator, change_processor); 428 return SyncComponents(model_associator, change_processor);
428 } 429 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/glue/bookmark_model_associator.cc ('k') | chrome/browser/sync/profile_sync_service_bookmark_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698