Inner bug: b/31163918
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/c9726f4e10331b7c91542b3e35b22a2c483fd758 commit c9726f4e10331b7c91542b3e35b22a2c483fd758 Author: khmel <khmel@chromium.org> Date: Thu Sep 01 20:47:51 2016 arc: Dont sync app list change caused by Arc opt out. Arc Opt out was recently changed and it is now local change. This causes the problem with syncing app list info because Arc apps are removed from local app list model, shelf and these changes are sent to sync. As result, if user runs another Arc device, Arc apps there will be removed from app list and pin. Solution is not to sync changes, caused by Arc opt out. TEST=Manually on device, opt out Arc on one device and Arc apps are not removed from shelf and app list on another running device. Re-enable Arc again and Arc apps are restrored at the same positions in shelf and App list. TEST=Extended and updated unit_tests BUG=b/31163918 BUG= 642864 Review-Url: https://codereview.chromium.org/2295343002 Cr-Commit-Position: refs/heads/master@{#416043} [modify] https://crrev.com/c9726f4e10331b7c91542b3e35b22a2c483fd758/chrome/browser/ui/app_list/app_list_model_builder.cc [modify] https://crrev.com/c9726f4e10331b7c91542b3e35b22a2c483fd758/chrome/browser/ui/app_list/app_list_model_builder.h [modify] https://crrev.com/c9726f4e10331b7c91542b3e35b22a2c483fd758/chrome/browser/ui/app_list/app_list_syncable_service.cc [modify] https://crrev.com/c9726f4e10331b7c91542b3e35b22a2c483fd758/chrome/browser/ui/app_list/arc/arc_app_model_builder.cc [modify] https://crrev.com/c9726f4e10331b7c91542b3e35b22a2c483fd758/chrome/browser/ui/app_list/extension_app_model_builder.cc [modify] https://crrev.com/c9726f4e10331b7c91542b3e35b22a2c483fd758/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc [modify] https://crrev.com/c9726f4e10331b7c91542b3e35b22a2c483fd758/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc [modify] https://crrev.com/c9726f4e10331b7c91542b3e35b22a2c483fd758/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h [modify] https://crrev.com/c9726f4e10331b7c91542b3e35b22a2c483fd758/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
Your change meets the bar and is auto-approved for M54 (branch: 2840)
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/451014828446abeb8d51995fb15caee0029b644d commit 451014828446abeb8d51995fb15caee0029b644d Author: khmel <khmel@chromium.org> Date: Tue Sep 06 22:50:29 2016 [Merge-M54] arc: Dont sync app list change caused by Arc opt out. Arc Opt out was recently changed and it is now local change. This causes the problem with syncing app list info because Arc apps are removed from local app list model, shelf and these changes are sent to sync. As result, if user runs another Arc device, Arc apps there will be removed from app list and pin. Solution is not to sync changes, caused by Arc opt out. TEST=Manually on device, opt out Arc on one device and Arc apps are not removed from shelf and app list on another running device. Re-enable Arc again and Arc apps are restrored at the same positions in shelf and App list. TEST=Extended and updated unit_tests BUG=b/31163918 BUG= 642864 TBR=reviewer@chromium.org NOTRY=true NOPRESUBMIT=true Review-Url: https://codereview.chromium.org/2295343002 Cr-Commit-Position: refs/heads/master@{#416043} (cherry picked from commit c9726f4e10331b7c91542b3e35b22a2c483fd758) Review-Url: https://codereview.chromium.org/2317523003 Cr-Commit-Position: refs/branch-heads/2840@{#189} Cr-Branched-From: 1ae106dbab4bddd85132d5b75c670794311f4c57-refs/heads/master@{#414607} [modify] https://crrev.com/451014828446abeb8d51995fb15caee0029b644d/chrome/browser/ui/app_list/app_list_model_builder.cc [modify] https://crrev.com/451014828446abeb8d51995fb15caee0029b644d/chrome/browser/ui/app_list/app_list_model_builder.h [modify] https://crrev.com/451014828446abeb8d51995fb15caee0029b644d/chrome/browser/ui/app_list/app_list_syncable_service.cc [modify] https://crrev.com/451014828446abeb8d51995fb15caee0029b644d/chrome/browser/ui/app_list/arc/arc_app_model_builder.cc [modify] https://crrev.com/451014828446abeb8d51995fb15caee0029b644d/chrome/browser/ui/app_list/extension_app_model_builder.cc [modify] https://crrev.com/451014828446abeb8d51995fb15caee0029b644d/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc [modify] https://crrev.com/451014828446abeb8d51995fb15caee0029b644d/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc [modify] https://crrev.com/451014828446abeb8d51995fb15caee0029b644d/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h [modify] https://crrev.com/451014828446abeb8d51995fb15caee0029b644d/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
This was requested to merge to M53,
This appears to be ARC specific and should be ok for R53, let us merge.
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/985ab005e0a7858c8eecd93ae4affadcaf32f326 commit 985ab005e0a7858c8eecd93ae4affadcaf32f326 Author: khmel <khmel@chromium.org> Date: Thu Sep 08 16:10:05 2016 [Merge-M53] arc: Don't sync app list change caused by Arc opt out. Arc Opt out was recently changed and it is now local change. This causes the problem with syncing app list info because Arc apps are removed from local app list model, shelf and these changes are sent to sync. As result, if user runs another Arc device, Arc apps there will be removed from app list and pin. Solution is not to sync changes, caused by Arc opt out. TEST=Manually on device, opt out Arc on one device and Arc apps are not removed from shelf and app list on another running device. Re-enable Arc again and Arc apps are restrored at the same positions in shelf and App list. TEST=Extended and updated unit_tests BUG=b/31163918 BUG= 642864 TBR=reviewer@chromium.org NOTRY=true NOPRESUBMIT=true Review-Url: https://codereview.chromium.org/2295343002 Cr-Commit-Position: refs/heads/master@{#416043} (cherry picked from commit c9726f4e10331b7c91542b3e35b22a2c483fd758) Review-Url: https://codereview.chromium.org/2316273004 Cr-Commit-Position: refs/branch-heads/2785@{#850} Cr-Branched-From: 68623971be0cfc492a2cb0427d7f478e7b214c24-refs/heads/master@{#403382} [modify] https://crrev.com/985ab005e0a7858c8eecd93ae4affadcaf32f326/chrome/browser/ui/app_list/app_list_model_builder.cc [modify] https://crrev.com/985ab005e0a7858c8eecd93ae4affadcaf32f326/chrome/browser/ui/app_list/app_list_model_builder.h [modify] https://crrev.com/985ab005e0a7858c8eecd93ae4affadcaf32f326/chrome/browser/ui/app_list/app_list_syncable_service.cc [modify] https://crrev.com/985ab005e0a7858c8eecd93ae4affadcaf32f326/chrome/browser/ui/app_list/arc/arc_app_model_builder.cc [modify] https://crrev.com/985ab005e0a7858c8eecd93ae4affadcaf32f326/chrome/browser/ui/app_list/extension_app_model_builder.cc [modify] https://crrev.com/985ab005e0a7858c8eecd93ae4affadcaf32f326/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc [modify] https://crrev.com/985ab005e0a7858c8eecd93ae4affadcaf32f326/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc [modify] https://crrev.com/985ab005e0a7858c8eecd93ae4affadcaf32f326/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h [modify] https://crrev.com/985ab005e0a7858c8eecd93ae4affadcaf32f326/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
Comment 1 by bugdroid1@chromium.org
, Sep 1 2016