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

chrome/browser/ui/app_list/app_list_syncable_service.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/app_list/app_list_syncable_service.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 201 matching lines @@
   }
 
   void OnAppListItemWillBeDeleted(AppListItem* item) override {
     DCHECK(!adding_item_);
     VLOG(2) << owner_ << " OnAppListItemDeleted: " << item->ToDebugString();
     // Don't sync folder removal in case the folder still exists on another
     // device (e.g. with device specific items in it). Empty folders will be
     // 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());
   }
 
   void OnAppListItemUpdated(AppListItem* item) override {
     if (adding_item_) {
       // Adding an item may trigger update notifications which should be
       // ignored.
       DCHECK_EQ(adding_item_, item);
       return;
     }
@@ skipping 830 matching lines @@
     res += " { " + item_name + " }";
     res += " [" + item_ordinal.ToDebugString() + "]";
     if (!parent_id.empty())
       res += " <" + parent_id.substr(0, 8) + ">";
     res += " [" + item_pin_ordinal.ToDebugString() + "]";
   }
   return res;
 }
 
 }  // namespace app_list