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

Unified Diff: chrome/browser/ui/app_list/app_list_syncable_service.cc

Issue 222553003: Disable AppList sync by default on non Chrome OS (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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/app_list/app_list_syncable_service.cc
diff --git a/chrome/browser/ui/app_list/app_list_syncable_service.cc b/chrome/browser/ui/app_list/app_list_syncable_service.cc
index 18fd13987f0a29fa623545ad24391aa7995be030..541079c0c3bf94be146bb09e5ef7c4baef1ba6b0 100644
--- a/chrome/browser/ui/app_list/app_list_syncable_service.cc
+++ b/chrome/browser/ui/app_list/app_list_syncable_service.cc
@@ -36,11 +36,6 @@ namespace {
const char kOemFolderId[] = "ddb1da55-d478-4243-8642-56d3041f0263";
-bool SyncAppListEnabled() {
- return !CommandLine::ForCurrentProcess()->HasSwitch(
- ::switches::kDisableSyncAppList);
-}
-
void UpdateSyncItemFromSync(const sync_pb::AppListSpecifics& specifics,
AppListSyncableService::SyncItem* item) {
DCHECK_EQ(item->item_id, specifics.item_id());
@@ -222,7 +217,9 @@ void AppListSyncableService::BuildModel() {
apps_builder_.reset(new ExtensionAppModelBuilder(controller));
DCHECK(profile_);
// TODO(stevenjb): Correctly handle OTR profiles for Guest mode.
- if (!profile_->IsOffTheRecord() && SyncAppListEnabled()) {
+ // crbug.com/359176.
+ if (!profile_->IsOffTheRecord() &&
+ app_list::switches::IsAppListSyncEnabled()) {
VLOG(1) << this << ": AppListSyncableService: InitializeWithService.";
SyncStarted();
apps_builder_->InitializeWithService(this);
« no previous file with comments | « chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698