ash: Fix variable names and setters in ShelfLayoutManager and tests

ash/shelf/shelf_layout_manager.h

 // Copyright 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.
 
 #ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
 
 #include <memory>
 #include <vector>
 
@@ skipping 66 matching lines @@
   // user can drag the shelf out.
   static const int kWorkspaceAreaAutoHideInset;
 
   // Size of the shelf when auto-hidden.
   static const int kAutoHideSize;
 
   // Inset between the inner edge of the shelf (towards centre of screen), and
   // the shelf items, notifications, status area etc.
   static const int kShelfItemInset;
 
-  explicit ShelfLayoutManager(ShelfWidget* shelf);
+  explicit ShelfLayoutManager(ShelfWidget* shelf_widget);
   ~ShelfLayoutManager() override;
 
   void set_workspace_controller(WorkspaceController* controller) {
     workspace_controller_ = controller;
   }
 
   bool updating_bounds() const { return updating_bounds_; }
 
   // Clears internal data for shutdown process.
   void PrepareForShutdown();
@@ skipping 34 matching lines @@
   // from an EventHandler. In mash these come from events that hit the shelf
   // widget and status tray widget.
   void UpdateAutoHideForMouseEvent(ui::MouseEvent* event);
   void UpdateAutoHideForGestureEvent(ui::GestureEvent* event);
 
   ShelfVisibilityState visibility_state() const {
     return state_.visibility_state;
   }
   ShelfAutoHideState auto_hide_state() const { return state_.auto_hide_state; }
 
-  ShelfWidget* shelf_widget() { return shelf_; }
+  ShelfWidget* shelf_widget() { return shelf_widget_; }
 
   // Sets whether any windows overlap the shelf. If a window overlaps the shelf
   // the shelf renders slightly differently.
   void SetWindowOverlapsShelf(bool value);
   bool window_overlaps_shelf() const { return window_overlaps_shelf_; }
 
   void AddObserver(ShelfLayoutManagerObserver* observer);
   void RemoveObserver(ShelfLayoutManagerObserver* observer);
 
   // Gesture related functions:
@@ skipping 23 matching lines @@
       aura::Window* gained_active,
       aura::Window* lost_active) override;
 
   // Overridden from ash::LockStateObserver:
   void OnLockStateEvent(LockStateObserver::EventType event) override;
 
   // Overridden from ash::SessionStateObserver:
   void SessionStateChanged(SessionStateDelegate::SessionState state) override;
 
   // TODO(msw): Remove these accessors, kept temporarily to simplify changes.
-  void SetAutoHideBehavior(ShelfAutoHideBehavior behavior) {
-    shelf_->shelf()->SetAutoHideBehavior(behavior);
+  wm::ShelfAlignment GetAlignment() const {
+    return shelf_widget_->GetAlignment();
   }
-  ShelfAutoHideBehavior auto_hide_behavior() const {
-    return shelf_->shelf()->auto_hide_behavior();
-  }
-
-  // TODO(msw): Remove these accessors, kept temporarily to simplify changes.
-  void SetAlignment(wm::ShelfAlignment alignment) {
-    shelf_->shelf()->SetAlignment(alignment);
-  }
-  wm::ShelfAlignment GetAlignment() const { return shelf_->GetAlignment(); }
 
   // TODO(harrym|oshima): These templates will be moved to a new Shelf class.
   // A helper function for choosing values specific to a shelf alignment.
   template <typename T>
   T SelectValueForShelfAlignment(T bottom, T left, T right) const {
     switch (GetAlignment()) {
       case wm::SHELF_ALIGNMENT_BOTTOM:
       case wm::SHELF_ALIGNMENT_BOTTOM_LOCKED:
         return bottom;
       case wm::SHELF_ALIGNMENT_LEFT:
@@ skipping 136 matching lines @@
 
   // True when inside UpdateBoundsAndOpacity() method. Used to prevent calling
   // UpdateBoundsAndOpacity() again from SetChildBounds().
   bool updating_bounds_;
 
   bool in_shutdown_ = false;
 
   // Current state.
   State state_;
 
-  ShelfWidget* shelf_;
+  ShelfWidget* shelf_widget_;
 
   WorkspaceController* workspace_controller_;
 
   // Do any windows overlap the shelf? This is maintained by WorkspaceManager.
   bool window_overlaps_shelf_;
 
   base::OneShotTimer auto_hide_timer_;
 
   // Whether the mouse was over the shelf when the auto hide timer started.
   // False when neither the auto hide timer nor the timer task are running.
@@ skipping 51 matching lines @@
 
   std::unique_ptr<RootWindowControllerObserverImpl>
       root_window_controller_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_