ash: Fix variable names and setters in ShelfLayoutManager and tests

ash/shelf/shelf.h

 // 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.
 
 #ifndef ASH_SHELF_SHELF_H_
 #define ASH_SHELF_SHELF_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
@@ skipping 58 matching lines @@
   void SetAlignment(wm::ShelfAlignment alignment);
   wm::ShelfAlignment alignment() const { return alignment_; }
   bool IsHorizontalAlignment() const;
 
   // Sets the ShelfAutoHideBehavior. See enum description for details.
   void SetAutoHideBehavior(ShelfAutoHideBehavior auto_hide_behavior);
   ShelfAutoHideBehavior auto_hide_behavior() const {
     return auto_hide_behavior_;
   }
 
+  ShelfAutoHideState GetAutoHideState() const;
+
+  // See enum description for details.

[msw, 2016/06/01 17:30:08]

nit: remove comment, or add similar to GetAutoHideState.

[James Cook, 2016/06/01 17:56:04]

Done.

+  ShelfVisibilityState GetVisibilityState() const;
+
   // A helper functions that chooses values specific to a shelf alignment.
   template <typename T>
   T SelectValueForShelfAlignment(T bottom, T left, T right) const {
     switch (alignment_) {
       case wm::SHELF_ALIGNMENT_BOTTOM:
       case wm::SHELF_ALIGNMENT_BOTTOM_LOCKED:
         return bottom;
       case wm::SHELF_ALIGNMENT_LEFT:
         return left;
       case wm::SHELF_ALIGNMENT_RIGHT:
@@ skipping 70 matching lines @@
 
   wm::ShelfAlignment alignment_ = wm::SHELF_ALIGNMENT_BOTTOM;
   ShelfAutoHideBehavior auto_hide_behavior_ = SHELF_AUTO_HIDE_BEHAVIOR_NEVER;
 
   DISALLOW_COPY_AND_ASSIGN(Shelf);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_H_