Fix shelf auto-hide calculation for app-list visibility.

ash/common/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/common/shelf/shelf_layout_manager.h"
 
 #include <algorithm>
 #include <cmath>
 #include <vector>
 
@@ skipping 819 matching lines @@
   if (visibility_state != SHELF_AUTO_HIDE || !wm_shelf_->IsShelfInitialized())
     return SHELF_AUTO_HIDE_HIDDEN;
 
   const int64_t shelf_display_id = WmLookup::Get()
                                        ->GetWindowForWidget(shelf_widget_)
                                        ->GetDisplayNearestWindow()
                                        .id();
 
   // Unhide the shelf only on the active screen when the AppList is shown
   // (crbug.com/312445).
-  if (WmShell::Get()->GetAppListTargetVisibility()) {
-    WmWindow* window = WmShell::Get()->GetActiveWindow();
-    if (window && window->GetDisplayNearestWindow().id() == shelf_display_id)
-      return SHELF_AUTO_HIDE_SHOWN;
+  if (WmShell::Get()->GetAppListTargetVisibility(shelf_display_id) ||
+      WmShell::Get()->IsApplistVisible(shelf_display_id)) {
+    return SHELF_AUTO_HIDE_SHOWN;
   }
 
   if (shelf_widget_->status_area_widget() &&
       shelf_widget_->status_area_widget()->ShouldShowShelf())
     return SHELF_AUTO_HIDE_SHOWN;
 
   if (shelf_widget_->IsShowingContextMenu())
     return SHELF_AUTO_HIDE_SHOWN;
 
   if (shelf_widget_->IsShowingOverflowBubble())
@@ skipping 248 matching lines @@
   gesture_drag_status_ = GESTURE_DRAG_NONE;
 }
 
 void ShelfLayoutManager::CancelGestureDrag() {
   gesture_drag_status_ = GESTURE_DRAG_CANCEL_IN_PROGRESS;
   UpdateVisibilityState();
   gesture_drag_status_ = GESTURE_DRAG_NONE;
 }
 
 }  // namespace ash