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

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

Issue 187813006: Enable App List Sync by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 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/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 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 337
338 // App setting sync is enabled by default. Register unless explicitly 338 // App setting sync is enabled by default. Register unless explicitly
339 // disabled. 339 // disabled.
340 if (!command_line_->HasSwitch(switches::kDisableSyncAppSettings)) { 340 if (!command_line_->HasSwitch(switches::kDisableSyncAppSettings)) {
341 pss->RegisterDataTypeController( 341 pss->RegisterDataTypeController(
342 new ExtensionSettingDataTypeController( 342 new ExtensionSettingDataTypeController(
343 syncer::APP_SETTINGS, this, profile_, pss)); 343 syncer::APP_SETTINGS, this, profile_, pss));
344 } 344 }
345 345
346 #if defined(ENABLE_APP_LIST) 346 #if defined(ENABLE_APP_LIST)
347 // App List sync is disabled by default. Register only if enabled. 347 if (!command_line_->HasSwitch(switches::kDisableSyncAppList)) {
348 if (command_line_->HasSwitch(switches::kEnableSyncAppList)) {
349 pss->RegisterDataTypeController( 348 pss->RegisterDataTypeController(
350 new UIDataTypeController( 349 new UIDataTypeController(
351 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI), 350 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
352 base::Bind(&ChromeReportUnrecoverableError), 351 base::Bind(&ChromeReportUnrecoverableError),
353 syncer::APP_LIST, 352 syncer::APP_LIST,
354 this, 353 this,
355 profile_, 354 profile_,
356 pss)); 355 pss));
357 } 356 }
358 #endif 357 #endif
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
608 ProfileSyncComponentsFactory::SyncComponents 607 ProfileSyncComponentsFactory::SyncComponents
609 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents( 608 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents(
610 ProfileSyncService* profile_sync_service, 609 ProfileSyncService* profile_sync_service,
611 DataTypeErrorHandler* error_handler) { 610 DataTypeErrorHandler* error_handler) {
612 SessionModelAssociator* model_associator = 611 SessionModelAssociator* model_associator =
613 new SessionModelAssociator(profile_sync_service, error_handler); 612 new SessionModelAssociator(profile_sync_service, error_handler);
614 SessionChangeProcessor* change_processor = 613 SessionChangeProcessor* change_processor =
615 new SessionChangeProcessor(error_handler, model_associator); 614 new SessionChangeProcessor(error_handler, model_associator);
616 return SyncComponents(model_associator, change_processor); 615 return SyncComponents(model_associator, change_processor);
617 } 616 }
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698