ash: Fix variable names and setters in ShelfLayoutManager and tests

ash/shelf/shelf.cc

 // Copyright 2013 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.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "ash/focus_cycler.h"
@@ skipping 87 matching lines @@
 void Shelf::SetAutoHideBehavior(ShelfAutoHideBehavior auto_hide_behavior) {
   if (auto_hide_behavior_ == auto_hide_behavior)
     return;
 
   auto_hide_behavior_ = auto_hide_behavior;
   delegate_->OnShelfAutoHideBehaviorChanged(this);
   Shell::GetInstance()->OnShelfAutoHideBehaviorChanged(
       shelf_widget_->GetNativeWindow()->GetRootWindow());
 }
 
+ShelfAutoHideState Shelf::GetAutoHideState() const {
+  return shelf_widget_->shelf_layout_manager()->auto_hide_state();
+}
+
+ShelfVisibilityState Shelf::GetVisibilityState() const {
+  return shelf_widget_->shelf_layout_manager()->visibility_state();
+}
+
 gfx::Rect Shelf::GetScreenBoundsOfItemIconForWindow(
     const aura::Window* window) {
   ShelfID id = GetShelfIDForWindow(window);
   gfx::Rect bounds(shelf_view_->GetIdealBoundsOfItemIcon(id));
   gfx::Point screen_origin;
   views::View::ConvertPointToScreen(shelf_view_, &screen_origin);
   return gfx::Rect(screen_origin.x() + bounds.x(),
                    screen_origin.y() + bounds.y(),
                    bounds.width(),
                    bounds.height());
@@ skipping 87 matching lines @@
 
 gfx::Rect Shelf::GetVisibleItemsBoundsInScreen() const {
   return shelf_view_->GetVisibleItemsBoundsInScreen();
 }
 
 app_list::ApplicationDragAndDropHost* Shelf::GetDragAndDropHostForAppList() {
   return shelf_view_;
 }
 
 }  // namespace ash