Added 1 liner to fix shelf background hiding on side shelf alignment.

ash/shelf/shelf_layout_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/shelf/shelf_layout_manager.h"
 
 #include <algorithm>
 #include <cmath>
 #include <vector>
 
@@ skipping 129 matching lines @@
 }
 
 // ShelfLayoutManager ----------------------------------------------------------
 
 ShelfLayoutManager::ShelfLayoutManager(ShelfWidget* shelf_widget, Shelf* shelf)
     : updating_bounds_(false),
       shelf_widget_(shelf_widget),
       shelf_(shelf),
       window_overlaps_shelf_(false),
       mouse_over_shelf_when_auto_hide_timer_started_(false),
+      is_fullscreen_app_list_enabled_(
+          app_list::features::IsFullscreenAppListEnabled()),
       gesture_drag_status_(GESTURE_DRAG_NONE),
       gesture_drag_amount_(0.f),
       gesture_drag_auto_hide_state_(SHELF_AUTO_HIDE_SHOWN),
       update_shelf_observer_(nullptr),
       chromevox_panel_height_(0),
       duration_override_in_ms_(0),
       shelf_background_type_(SHELF_BACKGROUND_OVERLAP),
       keyboard_observer_(this),
       scoped_session_observer_(this) {
   DCHECK(shelf_widget_);
@@ skipping 265 matching lines @@
       activated, root_window, shelf_widget_->GetNativeWindow()->GetRootWindow(),
       &keyboard_observer_);
 }
 
 void ShelfLayoutManager::OnAppListVisibilityChanged(bool shown,
                                                     aura::Window* root_window) {
   if (shelf_ != Shelf::ForWindow(root_window))
     return;
 
   is_app_list_visible_ = shown;
-  if (app_list::features::IsFullscreenAppListEnabled())
+  if (is_fullscreen_app_list_enabled_)
     MaybeUpdateShelfBackground(AnimationChangeType::IMMEDIATE);
 }
 
 void ShelfLayoutManager::OnWindowActivated(ActivationReason reason,
                                            aura::Window* gained_active,
                                            aura::Window* lost_active) {
   UpdateAutoHideStateNow();
 }
 
 void ShelfLayoutManager::OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) {
@@ skipping 26 matching lines @@
 }
 
 ShelfBackgroundType ShelfLayoutManager::GetShelfBackgroundType() const {
   if (state_.pre_lock_screen_animation_active)
     return SHELF_BACKGROUND_DEFAULT;
 
   // Handle all non active screen states, including OOBE and pre-login.
   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() &&
+      is_fullscreen_app_list_enabled_)
+    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())
+  if (is_app_list_visible_ && is_fullscreen_app_list_enabled_)
     return SHELF_BACKGROUND_DEFAULT;
 
   if (state_.visibility_state != SHELF_AUTO_HIDE &&
       state_.window_state == wm::WORKSPACE_WINDOW_STATE_MAXIMIZED) {
     return SHELF_BACKGROUND_MAXIMIZED;
   }
 
   if (gesture_drag_status_ == GESTURE_DRAG_IN_PROGRESS ||
       window_overlaps_shelf_ || state_.visibility_state == SHELF_AUTO_HIDE) {
     return SHELF_BACKGROUND_OVERLAP;
@@ skipping 669 matching lines @@
       return gesture_drag_amount_ < 0;
     case SHELF_ALIGNMENT_LEFT:
       if (gesture_drag_auto_hide_state_ == SHELF_AUTO_HIDE_SHOWN)
         return gesture_drag_amount_ < 0;
       return gesture_drag_amount_ > 0;
   }
   return false;
 }
 
 }  // namespace ash