ash: Remove unnecessary utility methods from ash::Shelf

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 887 matching lines @@
   if (WmShell::Get()->GetAppListTargetVisibility()) {
     WmWindow* window = WmShell::Get()->GetActiveWindow();
     if (window && window->GetDisplayNearestWindow().id() == 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_->shelf() && shelf_widget_->shelf()->IsShowingMenu())
+  if (shelf_widget_->IsShowingContextMenu())
     return SHELF_AUTO_HIDE_SHOWN;
 
-  if (shelf_widget_->shelf() &&
-      shelf_widget_->shelf()->IsShowingOverflowBubble())
+  if (shelf_widget_->IsShowingOverflowBubble())
     return SHELF_AUTO_HIDE_SHOWN;
 
   if (shelf_widget_->IsActive() ||
       (shelf_widget_->status_area_widget() &&
        shelf_widget_->status_area_widget()->IsActive()))
     return SHELF_AUTO_HIDE_SHOWN;
 
   const std::vector<WmWindow*> windows =
       WmShell::Get()->mru_window_tracker()->BuildWindowListIgnoreModal();
 
@@ skipping 254 matching lines @@
   gesture_drag_status_ = GESTURE_DRAG_NONE;
 }
 
 int ShelfLayoutManager::GetShelfInsetsForAutoHide() const {
   if (invisible_auto_hide_shelf_)
     return 0;
   return GetShelfConstant(SHELF_INSETS_FOR_AUTO_HIDE);
 }
 
 }  // namespace ash