-
Yuta Kitamura authored
This reverts commit f2baca71. Reason for revert: This CL is triggering a CHECK failure in a few tests in ash_unittests. Failed tests: ShelfApplicationMenuModelTest.VerifyContentsWithMenuItems ShelfApplicationMenuModelTest.VerifyContentsWithNoMenuItems ShelfApplicationMenuModelTest.VerifyHistogramBuckets ShelfApplicationMenuModelTest.VerifyHistogramOnExecute ShelfViewInkDropTest.ShelfButtonWithMenuPressRelease Started to fail since: https://ci.chromium.org/p/chromium/builders/ci/linux-chromeos-dbg/14866 (Just look at ash_unittests, other failures are irrelevant) Crash log sample: [ RUN ] ShelfViewInkDropTest.ShelfButtonWithMenuPressRelease [15893:15893:1017/174420.948496:6297578335:FATAL:simple_menu_model.cc(561)] Check failed: item.command_id >= 0 (-2 vs. 0) Original change's description: > Menu Model: fix bug where menu item title was greyed out because it is disabled. > > The old approach of adding title as a disabled item meant that this CL: > > https://chromium-review.googlesource.com/c/chromium/src/+/1788198 > > causes the menu title to be displayed in grey text instead of solid black text. This CL introduces a new menu type that, while still disabled and non-reactive, be displayed in solid black text. > > Bug: 1006203 > Change-Id: I9fa38132160228ebde5bd43d8db9c2f60d5f001c > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1841583 > Reviewed-by: Scott Violet <sky@chromium.org> > Reviewed-by: Toni Baržić <tbarzic@chromium.org> > Commit-Queue: Yulun Wu <yulunwu@chromium.org> > Auto-Submit: Yulun Wu <yulunwu@chromium.org> > Cr-Commit-Position: refs/heads/master@{#707147} TBR=tbarzic@chromium.org,sky@chromium.org,msw@chromium.org,newcomer@chromium.org,yulunwu@chromium.org Change-Id: I39a3bebb393d70e1dbeb6da61908f7ec2e3e9b2e No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 1006203 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1869050Reviewed-by:
Yuta Kitamura <yutak@chromium.org> Commit-Queue: Yuta Kitamura <yutak@chromium.org> Cr-Commit-Position: refs/heads/master@{#707287}
9f787eef