Commit f677dce4 authored by Manu Cornet's avatar Manu Cornet Committed by Commit Bot

CrOS Systray: Guard removal of overview btn background with hotseat flag

The spec is at https://guidelines.googleplex.com/crosux-spec/feature-specs/shelf-tablet.html#shelf-tablet-home
(in-app shelf) but should only apply when the hotseat flag is on.

Bug: 1009367
Change-Id: If176d7f14a8573f06a5c37c0cb2b5ae95179a761
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1832654
Auto-Submit: Manu Cornet <manucornet@chromium.org>
Reviewed-by: default avatarAhmed Fakhry <afakhry@chromium.org>
Commit-Queue: Manu Cornet <manucornet@chromium.org>
Cr-Commit-Position: refs/heads/master@{#701402}
parent eb7d2180
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "ash/system/tray/tray_event_filter.h" #include "ash/system/tray/tray_event_filter.h"
#include "ash/window_factory.h" #include "ash/window_factory.h"
#include "ash/wm/tablet_mode/tablet_mode_controller.h" #include "ash/wm/tablet_mode/tablet_mode_controller.h"
#include "chromeos/constants/chromeos_switches.h"
#include "ui/accessibility/ax_node_data.h" #include "ui/accessibility/ax_node_data.h"
#include "ui/compositor/layer.h" #include "ui/compositor/layer.h"
#include "ui/compositor/layer_animation_element.h" #include "ui/compositor/layer_animation_element.h"
...@@ -133,7 +134,8 @@ class TrayBackground : public views::Background { ...@@ -133,7 +134,8 @@ class TrayBackground : public views::Background {
Shell::Get()->tablet_mode_controller() && Shell::Get()->tablet_mode_controller() &&
Shell::Get()->tablet_mode_controller()->InTabletMode(); Shell::Get()->tablet_mode_controller()->InTabletMode();
background_flags.setColor( background_flags.setColor(
tablet_mode && ShelfConfig::Get()->is_in_app() (chromeos::switches::ShouldShowShelfHotseat() && tablet_mode &&
ShelfConfig::Get()->is_in_app())
? SK_ColorTRANSPARENT ? SK_ColorTRANSPARENT
: ShelfConfig::Get() : ShelfConfig::Get()
->shelf_control_permanent_highlight_background()); ->shelf_control_permanent_highlight_background());
......
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