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

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

Issue 143973006: New Sync datatype for Synced Notifications App Info (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: AppInfo: Fix proto version number and cr comments Created 6 years, 10 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/about_flags.h" 7 #include "chrome/browser/about_flags.h"
8 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 8 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
9 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h" 9 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 pss->RegisterDataTypeController( 310 pss->RegisterDataTypeController(
311 new UIDataTypeController(syncer::APP_LIST, this, profile_, pss)); 311 new UIDataTypeController(syncer::APP_LIST, this, profile_, pss));
312 } 312 }
313 #endif 313 #endif
314 314
315 // Synced Notifications are enabled by default. 315 // Synced Notifications are enabled by default.
316 pss->RegisterDataTypeController( 316 pss->RegisterDataTypeController(
317 new UIDataTypeController( 317 new UIDataTypeController(
318 syncer::SYNCED_NOTIFICATIONS, this, profile_, pss)); 318 syncer::SYNCED_NOTIFICATIONS, this, profile_, pss));
319 319
320 // TODO(petewil): Enable the data type controller once we have a handler.
321
320 #if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) 322 #if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS)
321 // Dictionary sync is enabled by default. 323 // Dictionary sync is enabled by default.
322 if (!command_line_->HasSwitch(switches::kDisableSyncDictionary)) { 324 if (!command_line_->HasSwitch(switches::kDisableSyncDictionary)) {
323 pss->RegisterDataTypeController( 325 pss->RegisterDataTypeController(
324 new UIDataTypeController(syncer::DICTIONARY, this, profile_, pss)); 326 new UIDataTypeController(syncer::DICTIONARY, this, profile_, pss));
325 } 327 }
326 #endif 328 #endif
327 } 329 }
328 330
329 DataTypeManager* ProfileSyncComponentsFactoryImpl::CreateDataTypeManager( 331 DataTypeManager* ProfileSyncComponentsFactoryImpl::CreateDataTypeManager(
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
535 ProfileSyncComponentsFactory::SyncComponents 537 ProfileSyncComponentsFactory::SyncComponents
536 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents( 538 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents(
537 ProfileSyncService* profile_sync_service, 539 ProfileSyncService* profile_sync_service,
538 DataTypeErrorHandler* error_handler) { 540 DataTypeErrorHandler* error_handler) {
539 SessionModelAssociator* model_associator = 541 SessionModelAssociator* model_associator =
540 new SessionModelAssociator(profile_sync_service, error_handler); 542 new SessionModelAssociator(profile_sync_service, error_handler);
541 SessionChangeProcessor* change_processor = 543 SessionChangeProcessor* change_processor =
542 new SessionChangeProcessor(error_handler, model_associator); 544 new SessionChangeProcessor(error_handler, model_associator);
543 return SyncComponents(model_associator, change_processor); 545 return SyncComponents(model_associator, change_processor);
544 } 546 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698