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

Unified Diff: chrome/browser/sync/chrome_sync_client.cc

Issue 2740363002: [Sync] Fix EnableDisableSingleClientTest (Closed)
Patch Set: add {} Created 3 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
« no previous file with comments | « no previous file | chrome/browser/sync/profile_sync_service_factory_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/chrome_sync_client.cc
diff --git a/chrome/browser/sync/chrome_sync_client.cc b/chrome/browser/sync/chrome_sync_client.cc
index 2571a605ca9bc29a0994bf68abbce6b70ff88f52..47e6a8fa2c383d568ce5cd008b6456d638d28405 100644
--- a/chrome/browser/sync/chrome_sync_client.cc
+++ b/chrome/browser/sync/chrome_sync_client.cc
@@ -108,6 +108,7 @@
#endif
#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/arc/arc_util.h"
#include "chrome/browser/chromeos/printing/printers_manager.h"
#include "chrome/browser/chromeos/printing/printers_manager_factory.h"
#include "chrome/browser/chromeos/printing/printers_sync_bridge.h"
@@ -678,11 +679,11 @@ void ChromeSyncClient::RegisterDesktopDataTypes(
syncer::WIFI_CREDENTIALS, error_callback, this, syncer::GROUP_UI,
BrowserThread::GetTaskRunnerForThread(BrowserThread::UI)));
}
-
- // TODO(lgcheng): Add switch for this.
- sync_service->RegisterDataTypeController(
- base::MakeUnique<ArcPackageSyncDataTypeController>(
- syncer::ARC_PACKAGE, error_callback, this, profile_));
+ if (arc::IsArcAllowedForProfile(profile_)) {
+ sync_service->RegisterDataTypeController(
+ base::MakeUnique<ArcPackageSyncDataTypeController>(
+ syncer::ARC_PACKAGE, error_callback, this, profile_));
+ }
#endif
}
« no previous file with comments | « no previous file | chrome/browser/sync/profile_sync_service_factory_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698