GitLab

ScrollableShelfView records the number of corner buttons whose ripple
ring is activated. However, the count does not work as expected in the
following two scenarios:

(1) After transition between clamshell and tablet, the shelf icon's
context menu should be closed. However, when the count of activated
corner buttons updates at the end of ripple ring fadeout animation, due
to change in scrollable shelf's layout, the button whose ripple ring is
deactivated is not at the corner of shelf anymore. As a result, the
count does not decrease as expected.

(2) The count fails to decrease when removing an icon from context menu.
Because the ripple ring animation ends after shelf icon removes itself
from the ink drop listener list.

This CL fixes the issue by creating a scoped count owned by
ShelfAppButton

Bug: 1086484
Change-Id: Ib31f8b52d4da845d4a7dc945d44c7f38f3a4662f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2213877
Commit-Queue: Andrew Xu <andrewxu@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#772311}