Commit a2b8c99d authored by Andrew Xu's avatar Andrew Xu Committed by Commit Bot

Enable the Hotseat by default in M-81

Enable the hotseat feature as default. Besides that, this CL does the
following things:
In annotation_feature_enabled_test.js and zcr_remote_shell_unittests
.cc, the current tests assume that the shelf icon's size is 56x56 which
is not always true under hotseat. So those tests are fixed by hard code.

TBR=tbarzic@chromium.org,oshima@chromium.org
tbarzic: chromeos_features.cc
oshima: zcr_remote_shell_unittest.cc

Bug: 1032702
Change-Id: I3b51893d4724e6f085fea8ca7c0b9b415e6cea4c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1974861Reviewed-by: default avatarMatthew Mourgos <mmourgos@chromium.org>
Commit-Queue: Matthew Mourgos <mmourgos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#727654}
parent eaf834db
...@@ -73,9 +73,9 @@ chrome.test.runTests([ ...@@ -73,9 +73,9 @@ chrome.test.runTests([
chrome.test.assertEq(3, cameras.length); chrome.test.assertEq(3, cameras.length);
const expectations = [ const expectations = [
{top: 44.25, left: -106.5, right: 718.5, bottom: -442.5}, {top: 44.25, left: -106.5, right: 718.5, bottom: -448.5},
{top: 23.25, left: -3.75, right: 408.75, bottom: -220.125}, {top: 23.25, left: -3.75, right: 408.75, bottom: -223.125},
{top: -14.25, left: 33.75, right: 446.25, bottom: -257.625}, {top: -14.25, left: 33.75, right: 446.25, bottom: -260.625},
]; ];
for (const expectation of expectations) { for (const expectation of expectations) {
......
...@@ -220,7 +220,7 @@ const base::Feature kShelfScrollable{"ShelfScrollable", ...@@ -220,7 +220,7 @@ const base::Feature kShelfScrollable{"ShelfScrollable",
// Enables or disables the shelf hotseat. // Enables or disables the shelf hotseat.
const base::Feature kShelfHotseat{"ShelfHotseat", const base::Feature kShelfHotseat{"ShelfHotseat",
base::FEATURE_DISABLED_BY_DEFAULT}; base::FEATURE_ENABLED_BY_DEFAULT};
// Enables or disables a toggle to enable Bluetooth debug logs. // Enables or disables a toggle to enable Bluetooth debug logs.
const base::Feature kShowBluetoothDebugLogToggle{ const base::Feature kShowBluetoothDebugLogToggle{
......
...@@ -23,7 +23,7 @@ TEST_F(ZcrRemoteShellTest, GetWorkAreaInsetsInClientPixel) { ...@@ -23,7 +23,7 @@ TEST_F(ZcrRemoteShellTest, GetWorkAreaInsetsInClientPixel) {
gfx::Insets insets = wayland::GetWorkAreaInsetsInClientPixel( gfx::Insets insets = wayland::GetWorkAreaInsetsInClientPixel(
display, device_scale_factor, display.GetSizeInPixel(), display, device_scale_factor, display.GetSizeInPixel(),
display.work_area()); display.work_area());
EXPECT_EQ(gfx::Insets(0, 0, 128, 0).ToString(), insets.ToString()); EXPECT_EQ(gfx::Insets(0, 0, 110, 0).ToString(), insets.ToString());
auto secondary_display = GetSecondaryDisplay(); auto secondary_display = GetSecondaryDisplay();
gfx::Size secondary_size(secondary_display.size()); gfx::Size secondary_size(secondary_display.size());
...@@ -32,7 +32,7 @@ TEST_F(ZcrRemoteShellTest, GetWorkAreaInsetsInClientPixel) { ...@@ -32,7 +32,7 @@ TEST_F(ZcrRemoteShellTest, GetWorkAreaInsetsInClientPixel) {
gfx::Insets secondary_insets = wayland::GetWorkAreaInsetsInClientPixel( gfx::Insets secondary_insets = wayland::GetWorkAreaInsetsInClientPixel(
secondary_display, device_scale_factor, secondary_size_in_client_pixel, secondary_display, device_scale_factor, secondary_size_in_client_pixel,
secondary_display.work_area()); secondary_display.work_area());
EXPECT_EQ(gfx::Insets(0, 0, 126, 0).ToString(), secondary_insets.ToString()); EXPECT_EQ(gfx::Insets(0, 0, 108, 0).ToString(), secondary_insets.ToString());
// Stable Insets // Stable Insets
auto widget = CreateTestWidget(); auto widget = CreateTestWidget();
...@@ -42,11 +42,11 @@ TEST_F(ZcrRemoteShellTest, GetWorkAreaInsetsInClientPixel) { ...@@ -42,11 +42,11 @@ TEST_F(ZcrRemoteShellTest, GetWorkAreaInsetsInClientPixel) {
gfx::Insets stable_insets = wayland::GetWorkAreaInsetsInClientPixel( gfx::Insets stable_insets = wayland::GetWorkAreaInsetsInClientPixel(
display, device_scale_factor, display.GetSizeInPixel(), display, device_scale_factor, display.GetSizeInPixel(),
wayland::GetStableWorkArea(display)); wayland::GetStableWorkArea(display));
EXPECT_EQ(gfx::Insets(0, 0, 128, 0).ToString(), stable_insets.ToString()); EXPECT_EQ(gfx::Insets(0, 0, 110, 0).ToString(), stable_insets.ToString());
gfx::Insets secondary_stable_insets = wayland::GetWorkAreaInsetsInClientPixel( gfx::Insets secondary_stable_insets = wayland::GetWorkAreaInsetsInClientPixel(
secondary_display, device_scale_factor, secondary_size_in_client_pixel, secondary_display, device_scale_factor, secondary_size_in_client_pixel,
wayland::GetStableWorkArea(secondary_display)); wayland::GetStableWorkArea(secondary_display));
EXPECT_EQ(gfx::Insets(0, 0, 126, 0).ToString(), EXPECT_EQ(gfx::Insets(0, 0, 108, 0).ToString(),
secondary_stable_insets.ToString()); secondary_stable_insets.ToString());
} }
......
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