Commit 35177c83 authored by Manu Cornet's avatar Manu Cornet Committed by Commit Bot

CrOS Shelf: Don't show nav background when in-app

Bug: 982512
Change-Id: Icedebc7c56989e5448f077251f3b6099f83e57ff
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1824357Reviewed-by: default avatarAndrew Xu <andrewxu@chromium.org>
Commit-Queue: Manu Cornet <manucornet@chromium.org>
Cr-Commit-Position: refs/heads/master@{#699570}
parent 2fe5f72d
...@@ -247,9 +247,13 @@ void ShelfNavigationWidget::UpdateLayout() { ...@@ -247,9 +247,13 @@ void ShelfNavigationWidget::UpdateLayout() {
tablet_mode ? GetSecondButtonBounds() : GetFirstButtonBounds()); tablet_mode ? GetSecondButtonBounds() : GetFirstButtonBounds());
GetBackButton()->SetBoundsRect(GetFirstButtonBounds()); GetBackButton()->SetBoundsRect(GetFirstButtonBounds());
delegate_->SetBackground(views::CreateRoundedRectBackground( if (IsTabletMode() && ShelfConfig::Get()->is_in_app()) {
ShelfConfig::Get()->shelf_control_permanent_highlight_background(), delegate_->SetBackground(views::CreateSolidBackground(SK_ColorTRANSPARENT));
ShelfConfig::Get()->control_border_radius())); } else {
delegate_->SetBackground(views::CreateRoundedRectBackground(
ShelfConfig::Get()->shelf_control_permanent_highlight_background(),
ShelfConfig::Get()->control_border_radius()));
}
} }
} // namespace ash } // namespace ash
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