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

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

Issue 408003002: [Sync] Fix namespace for sync_driver component (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compile and chrome/ usage Created 6 years, 5 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/bookmarks/enhanced_bookmarks_features.h" 8 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h"
9 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h" 9 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h"
10 #include "chrome/browser/history/history_service.h" 10 #include "chrome/browser/history/history_service.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 #include "chrome/browser/spellchecker/spellcheck_factory.h" 96 #include "chrome/browser/spellchecker/spellcheck_factory.h"
97 #include "chrome/browser/spellchecker/spellcheck_service.h" 97 #include "chrome/browser/spellchecker/spellcheck_service.h"
98 #endif 98 #endif
99 99
100 using browser_sync::AutofillDataTypeController; 100 using browser_sync::AutofillDataTypeController;
101 using browser_sync::AutofillProfileDataTypeController; 101 using browser_sync::AutofillProfileDataTypeController;
102 using browser_sync::BookmarkChangeProcessor; 102 using browser_sync::BookmarkChangeProcessor;
103 using browser_sync::BookmarkDataTypeController; 103 using browser_sync::BookmarkDataTypeController;
104 using browser_sync::BookmarkModelAssociator; 104 using browser_sync::BookmarkModelAssociator;
105 using browser_sync::ChromeReportUnrecoverableError; 105 using browser_sync::ChromeReportUnrecoverableError;
106 using browser_sync::DataTypeController;
107 using browser_sync::DataTypeErrorHandler;
108 using browser_sync::DataTypeManager;
109 using browser_sync::DataTypeManagerImpl;
110 using browser_sync::DataTypeManagerObserver;
111 using browser_sync::ExtensionBackedDataTypeController; 106 using browser_sync::ExtensionBackedDataTypeController;
112 using browser_sync::ExtensionDataTypeController; 107 using browser_sync::ExtensionDataTypeController;
113 using browser_sync::ExtensionSettingDataTypeController; 108 using browser_sync::ExtensionSettingDataTypeController;
114 using browser_sync::PasswordDataTypeController; 109 using browser_sync::PasswordDataTypeController;
115 using browser_sync::ProxyDataTypeController; 110 using sync_driver::ProxyDataTypeController;
maxbogue 2014/07/21 22:14:21 Looks like this one should be down with the rest o
Nicolas Zea 2014/07/21 22:23:30 Done.
116 using browser_sync::SearchEngineDataTypeController; 111 using browser_sync::SearchEngineDataTypeController;
117 using browser_sync::SessionDataTypeController; 112 using browser_sync::SessionDataTypeController;
118 using browser_sync::SharedChangeProcessor;
119 using browser_sync::SyncBackendHost; 113 using browser_sync::SyncBackendHost;
120 using browser_sync::ThemeDataTypeController; 114 using browser_sync::ThemeDataTypeController;
121 using browser_sync::TypedUrlChangeProcessor; 115 using browser_sync::TypedUrlChangeProcessor;
122 using browser_sync::TypedUrlDataTypeController; 116 using browser_sync::TypedUrlDataTypeController;
123 using browser_sync::TypedUrlModelAssociator; 117 using browser_sync::TypedUrlModelAssociator;
124 using browser_sync::UIDataTypeController;
125 using content::BrowserThread; 118 using content::BrowserThread;
119 using sync_driver::DataTypeController;
120 using sync_driver::DataTypeErrorHandler;
121 using sync_driver::DataTypeManager;
122 using sync_driver::DataTypeManagerImpl;
123 using sync_driver::DataTypeManagerObserver;
124 using sync_driver::SharedChangeProcessor;
125 using sync_driver::UIDataTypeController;
126 126
127 namespace { 127 namespace {
128 128
129 syncer::ModelTypeSet GetDisabledTypesFromCommandLine( 129 syncer::ModelTypeSet GetDisabledTypesFromCommandLine(
130 const CommandLine& command_line) { 130 const CommandLine& command_line) {
131 syncer::ModelTypeSet disabled_types; 131 syncer::ModelTypeSet disabled_types;
132 std::string disabled_types_str = 132 std::string disabled_types_str =
133 command_line.GetSwitchValueASCII(switches::kDisableSyncTypes); 133 command_line.GetSwitchValueASCII(switches::kDisableSyncTypes);
134 disabled_types = syncer::ModelTypeSetFromString(disabled_types_str); 134 disabled_types = syncer::ModelTypeSetFromString(disabled_types_str);
135 return disabled_types; 135 return disabled_types;
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 syncer::DICTIONARY, 438 syncer::DICTIONARY,
439 this)); 439 this));
440 } 440 }
441 #endif 441 #endif
442 } 442 }
443 443
444 DataTypeManager* ProfileSyncComponentsFactoryImpl::CreateDataTypeManager( 444 DataTypeManager* ProfileSyncComponentsFactoryImpl::CreateDataTypeManager(
445 const syncer::WeakHandle<syncer::DataTypeDebugInfoListener>& 445 const syncer::WeakHandle<syncer::DataTypeDebugInfoListener>&
446 debug_info_listener, 446 debug_info_listener,
447 const DataTypeController::TypeMap* controllers, 447 const DataTypeController::TypeMap* controllers,
448 const browser_sync::DataTypeEncryptionHandler* encryption_handler, 448 const sync_driver::DataTypeEncryptionHandler* encryption_handler,
449 SyncBackendHost* backend, 449 SyncBackendHost* backend,
450 DataTypeManagerObserver* observer, 450 DataTypeManagerObserver* observer,
451 browser_sync::FailedDataTypesHandler* failed_data_types_handler) { 451 sync_driver::FailedDataTypesHandler* failed_data_types_handler) {
452 return new DataTypeManagerImpl(base::Bind(ChromeReportUnrecoverableError), 452 return new DataTypeManagerImpl(base::Bind(ChromeReportUnrecoverableError),
453 debug_info_listener, 453 debug_info_listener,
454 controllers, 454 controllers,
455 encryption_handler, 455 encryption_handler,
456 backend, 456 backend,
457 observer, 457 observer,
458 failed_data_types_handler); 458 failed_data_types_handler);
459 } 459 }
460 460
461 browser_sync::SyncBackendHost* 461 browser_sync::SyncBackendHost*
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
670 attachment_uploader.Pass(), 670 attachment_uploader.Pass(),
671 attachment_downloader.Pass(), 671 attachment_downloader.Pass(),
672 delegate)); 672 delegate));
673 673
674 return attachment_service.Pass(); 674 return attachment_service.Pass();
675 } 675 }
676 676
677 ProfileSyncComponentsFactory::SyncComponents 677 ProfileSyncComponentsFactory::SyncComponents
678 ProfileSyncComponentsFactoryImpl::CreateBookmarkSyncComponents( 678 ProfileSyncComponentsFactoryImpl::CreateBookmarkSyncComponents(
679 ProfileSyncService* profile_sync_service, 679 ProfileSyncService* profile_sync_service,
680 DataTypeErrorHandler* error_handler) { 680 sync_driver::DataTypeErrorHandler* error_handler) {
681 BookmarkModel* bookmark_model = 681 BookmarkModel* bookmark_model =
682 BookmarkModelFactory::GetForProfile(profile_sync_service->profile()); 682 BookmarkModelFactory::GetForProfile(profile_sync_service->profile());
683 syncer::UserShare* user_share = profile_sync_service->GetUserShare(); 683 syncer::UserShare* user_share = profile_sync_service->GetUserShare();
684 // TODO(akalin): We may want to propagate this switch up eventually. 684 // TODO(akalin): We may want to propagate this switch up eventually.
685 #if defined(OS_ANDROID) 685 #if defined(OS_ANDROID)
686 const bool kExpectMobileBookmarksFolder = true; 686 const bool kExpectMobileBookmarksFolder = true;
687 #else 687 #else
688 const bool kExpectMobileBookmarksFolder = false; 688 const bool kExpectMobileBookmarksFolder = false;
689 #endif 689 #endif
690 BookmarkModelAssociator* model_associator = 690 BookmarkModelAssociator* model_associator =
691 new BookmarkModelAssociator(bookmark_model, 691 new BookmarkModelAssociator(bookmark_model,
692 profile_sync_service->profile(), 692 profile_sync_service->profile(),
693 user_share, 693 user_share,
694 error_handler, 694 error_handler,
695 kExpectMobileBookmarksFolder); 695 kExpectMobileBookmarksFolder);
696 BookmarkChangeProcessor* change_processor = 696 BookmarkChangeProcessor* change_processor =
697 new BookmarkChangeProcessor(profile_sync_service->profile(), 697 new BookmarkChangeProcessor(profile_sync_service->profile(),
698 model_associator, 698 model_associator,
699 error_handler); 699 error_handler);
700 return SyncComponents(model_associator, change_processor); 700 return SyncComponents(model_associator, change_processor);
701 } 701 }
702 702
703 ProfileSyncComponentsFactory::SyncComponents 703 ProfileSyncComponentsFactory::SyncComponents
704 ProfileSyncComponentsFactoryImpl::CreateTypedUrlSyncComponents( 704 ProfileSyncComponentsFactoryImpl::CreateTypedUrlSyncComponents(
705 ProfileSyncService* profile_sync_service, 705 ProfileSyncService* profile_sync_service,
706 history::HistoryBackend* history_backend, 706 history::HistoryBackend* history_backend,
707 browser_sync::DataTypeErrorHandler* error_handler) { 707 sync_driver::DataTypeErrorHandler* error_handler) {
708 TypedUrlModelAssociator* model_associator = 708 TypedUrlModelAssociator* model_associator =
709 new TypedUrlModelAssociator(profile_sync_service, 709 new TypedUrlModelAssociator(profile_sync_service,
710 history_backend, 710 history_backend,
711 error_handler); 711 error_handler);
712 TypedUrlChangeProcessor* change_processor = 712 TypedUrlChangeProcessor* change_processor =
713 new TypedUrlChangeProcessor(profile_, 713 new TypedUrlChangeProcessor(profile_,
714 model_associator, 714 model_associator,
715 history_backend, 715 history_backend,
716 error_handler); 716 error_handler);
717 return SyncComponents(model_associator, change_processor); 717 return SyncComponents(model_associator, change_processor);
718 } 718 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698