ash: Move shelf alignment and auto-hide calls from Shell to Shelf

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 29 matching lines @@
 class ShelfView;
 
 namespace wm {
 class WmShelfAura;
 }
 
 namespace test {
 class ShelfTestAPI;
 }
 
+// Controller for shelf state. All access to state (visibility, auto-hide, etc.)
+// should occur via this class.
 class ASH_EXPORT Shelf {
  public:
   static const char kNativeViewName[];
 
   Shelf(ShelfModel* model, ShelfDelegate* delegate, ShelfWidget* widget);
   virtual ~Shelf();
 
   // Return the shelf for the primary display. NULL if no user is logged in yet.
+  // Useful for tests. For production code use ForWindow() because the user may
+  // have multiple displays.
   static Shelf* ForPrimaryDisplay();
 
   // Return the shelf for the display that |window| is currently on, or a shelf
   // on primary display if the shelf per display feature is disabled. NULL if no
   // user is logged in yet.
   static Shelf* ForWindow(const aura::Window* window);
 
   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_;
   }
 
-  // TODO(msw): Remove this accessor, kept temporarily to simplify changes.
-  ShelfAutoHideBehavior GetAutoHideBehavior() 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_