arc: Dont sync app list change caused by Arc opt out.

chrome/browser/ui/app_list/app_list_syncable_service.cc

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 97db26e0bff4e6158be83de2c0e6fe3c12ebb34f..2012a69a3f03dbeb72654d6640b822636dab1e90 100644
--- a/chrome/browser/ui/app_list/app_list_syncable_service.cc
+++ b/chrome/browser/ui/app_list/app_list_syncable_service.cc
@@ -219,6 +219,17 @@ class AppListSyncableService::ModelObserver : public AppListModelObserver {
     // deleted when the last item is removed (in PruneEmptySyncFolders()).
     if (item->GetItemType() == AppListFolderItem::kItemType)
       return;
+
+#if defined(OS_CHROMEOS)
+  if (item->GetItemType() == ArcAppItem::kItemType) {

[khmel, 2016/08/31 20:31:48]

I tried first not to modify AppListSync but OnAppListItemWillBeDeleted is quite
generic interface and used widely, modifying (adding additional flag or skipping
to call) it causes a lot of changes. So putting check here for Arc item here is
quite small.

[stevenjb, 2016/08/31 21:10:49]

This seems reasonable. We already have arc related dependencies here, although
we should add an explicit dependency on arc_auth_service.h in this file. (It is
included through arc_app_list_prefs.h, which is unintuitive, we should consider
moving ArcAuthService::Observer to its own header in a separate CL).

 

[xiyuan, 2016/08/31 21:43:09]

nit: fix indent

[khmel, 2016/09/01 00:03:02]

Thanks, will create additional CL to move ArcAuthService::Observer into separate
file (probably ArcAppListPrefs::Observer is also good candidate to do so)

[khmel, 2016/09/01 00:03:02]

Done.

+    // Don't sync remove changes coming as result of disabling Arc.
+    const arc::ArcAuthService* auth_service = arc::ArcAuthService::Get();
+    DCHECK(auth_service);
+    if (!auth_service->IsArcEnabled())
+      return;
+  }
+#endif
+
     owner_->RemoveSyncItem(item->id());
   }