Commit b480cb2c authored by Vladislav Kaznacheev's avatar Vladislav Kaznacheev Committed by Commit Bot

Disable kShelfScrollable feature by default.

This feature is not launching in M79.

Temporarily disabled two tricky tests, filed bugs to fix:
http://crbug.com/1015638
http://crbug.com/1015641

Bug: 973481
Test: ash_unittests
Change-Id: I17b2bda3fd383f76dbdf81f86ab638604d923582
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1865712Reviewed-by: default avatarManu Cornet <manucornet@chromium.org>
Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Vladislav Kaznacheev <kaznacheev@chromium.org>
Cr-Commit-Position: refs/heads/master@{#707369}
parent 916c54c5
...@@ -1698,7 +1698,7 @@ TEST_F(ShelfViewTest, OverflowBubbleSize) { ...@@ -1698,7 +1698,7 @@ TEST_F(ShelfViewTest, OverflowBubbleSize) {
overflow_shelf_view->GetPreferredSize().width()); overflow_shelf_view->GetPreferredSize().width());
} }
TEST_F(ShelfViewTest, OverflowShelfColorIsDerivedFromWallpaper) { TEST_F(ShelfViewTest, DISABLED_OverflowShelfColorIsDerivedFromWallpaper) {
// No overflow bubble when scrollable shelf enabled. // No overflow bubble when scrollable shelf enabled.
// TODO(https://crbug.com/1002576): revisit when scrollable shelf is launched. // TODO(https://crbug.com/1002576): revisit when scrollable shelf is launched.
if (chromeos::switches::ShouldShowScrollableShelf()) if (chromeos::switches::ShouldShowScrollableShelf())
...@@ -1905,7 +1905,7 @@ TEST_F(ShelfViewTest, CheckRipOffFromLeftShelfAlignmentWithMultiMonitor) { ...@@ -1905,7 +1905,7 @@ TEST_F(ShelfViewTest, CheckRipOffFromLeftShelfAlignmentWithMultiMonitor) {
// Checks various drag and drop operations from OverflowBubble to Shelf, and // Checks various drag and drop operations from OverflowBubble to Shelf, and
// vice versa. // vice versa.
TEST_F(ShelfViewTest, CheckDragAndDropFromShelfToOtherShelf) { TEST_F(ShelfViewTest, DISABLED_CheckDragAndDropFromShelfToOtherShelf) {
// No overflow bubble when scrollable shelf enabled. // No overflow bubble when scrollable shelf enabled.
// TODO(https://crbug.com/1002576): revisit when scrollable shelf is launched. // TODO(https://crbug.com/1002576): revisit when scrollable shelf is launched.
if (chromeos::switches::ShouldShowScrollableShelf()) if (chromeos::switches::ShouldShowScrollableShelf())
......
...@@ -183,7 +183,7 @@ const base::Feature kSessionManagerLongKillTimeout{ ...@@ -183,7 +183,7 @@ const base::Feature kSessionManagerLongKillTimeout{
// Enables or disables the scrollable shelf. // Enables or disables the scrollable shelf.
const base::Feature kShelfScrollable{"ShelfScrollable", const base::Feature kShelfScrollable{"ShelfScrollable",
base::FEATURE_ENABLED_BY_DEFAULT}; base::FEATURE_DISABLED_BY_DEFAULT};
// Enables or disables the shelf hotseat. // Enables or disables the shelf hotseat.
const base::Feature kShelfHotseat{"ShelfHotseat", const base::Feature kShelfHotseat{"ShelfHotseat",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment