Index: ash/shelf/shelf_layout_manager.cc |
diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc |
index 1336dc3b3daa4a49dd2a94d07905b073b333b8e2..38671868d68f668ee4ac4a507e13bcaf76a5eb69 100644 |
--- a/ash/shelf/shelf_layout_manager.cc |
+++ b/ash/shelf/shelf_layout_manager.cc |
@@ -479,6 +479,12 @@ ShelfBackgroundType ShelfLayoutManager::GetShelfBackgroundType() const { |
if (state_.session_state != session_manager::SessionState::ACTIVE) |
return SHELF_BACKGROUND_OVERLAP; |
+ // If the app list is active and the shelf is oriented vertically, enable the |
+ // shelf background. |
+ if (is_app_list_visible_ && !shelf_->IsHorizontalAlignment() && |
+ app_list::features::IsFullscreenAppListEnabled()) |
James Cook
2017/06/21 23:57:33
IsFullscreenAppListEnabled() runs a non-trivial am
newcomer
2017/06/22 00:16:09
I picked option 2 because that's what I've done el
|
+ return SHELF_BACKGROUND_OVERLAP; |
+ |
// If the app list is active, hide the shelf background to prevent overlap. |
if (is_app_list_visible_ && app_list::features::IsFullscreenAppListEnabled()) |
return SHELF_BACKGROUND_DEFAULT; |