Cleanup shelf initialization and observation.

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 <vector>
 
 #include "ash/ash_export.h"
@@ skipping 66 matching lines @@
   // 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);
   ~ShelfLayoutManager() override;
 
-  // Sets the ShelfAutoHideBehavior. See enum description for details.
-  void SetAutoHideBehavior(ShelfAutoHideBehavior behavior);
-  ShelfAutoHideBehavior auto_hide_behavior() const {
-    return auto_hide_behavior_;
-  }
-
-  // Sets the alignment; changes are delayed if the screen is locked.
-  void SetAlignment(ShelfAlignment alignment);
-
-  // Returns the desired alignment for the current state, either the user's
-  // selected alignment or SHELF_ALIGNMENT_BOTTOM when the screen is locked.
-  ShelfAlignment GetAlignment() const;
-
   void set_workspace_controller(WorkspaceController* controller) {
     workspace_controller_ = controller;
   }
 
   bool updating_bounds() const { return updating_bounds_; }
 
   // Clears internal data for shutdown process.
   void PrepareForShutdown();
 
   // Returns whether the shelf and its contents (shelf, status) are visible
@@ skipping 51 matching lines @@
   // shelf. Specifying 0 leads to use the default.
   void SetAnimationDurationOverride(int duration_override_in_ms);
 
   // Overridden from SnapLayoutManager:
   void OnWindowResized() override;
   void SetChildBounds(aura::Window* child,
                       const gfx::Rect& requested_bounds) override;
 
   // Overridden from ash::ShellObserver:
   void OnLockStateChanged(bool locked) override;
+  void OnShelfAlignmentChanged(aura::Window* root_window) override;
+  void OnShelfAutoHideBehaviorChanged(aura::Window* root_window) override;
 
   // Overriden from aura::client::ActivationChangeObserver:
   void OnWindowActivated(
       aura::client::ActivationChangeObserver::ActivationReason reason,
       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(harrym|oshima): These templates will be moved to
-  // new Shelf class.
-  // A helper function that provides a shortcut for choosing
-  // values specific to a shelf alignment.
+  // TODO(msw): Remove these accessors, kept temporarily to simplify changes.
+  void SetAutoHideBehavior(ShelfAutoHideBehavior behavior) {
+    shelf_->shelf()->SetAutoHideBehavior(behavior);
+  }
+  ShelfAutoHideBehavior auto_hide_behavior() const {
+    return shelf_->shelf()->GetAutoHideBehavior();
+  }
+
+  // TODO(msw): Remove these accessors, kept temporarily to simplify changes.
+  void SetAlignment(ShelfAlignment alignment) {
+    shelf_->shelf()->SetAlignment(alignment);
+  }
+  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 SHELF_ALIGNMENT_BOTTOM:
         return bottom;
       case SHELF_ALIGNMENT_LEFT:
         return left;
       case SHELF_ALIGNMENT_RIGHT:
         return right;
     }
     NOTREACHED();
     return right;
   }
 
   template<typename T>
   T PrimaryAxisValue(T horizontal, T vertical) const {
     return IsHorizontalAlignment() ? horizontal : vertical;
   }
 
   // Is the shelf's alignment horizontal?
   bool IsHorizontalAlignment() const;
 
+  // Returns true when the alignment is locked. This can be caused by the screen
+  // being locked, or when adding a user. Returns false when transitioning to a
+  // user session, and while the session is active.
+  bool IsAlignmentLocked() const;
+
   // Set the height of the ChromeVox panel, which takes away space from the
   // available work area from the top of the screen.
   void SetChromeVoxPanelHeight(int height);
 
  private:
   class AutoHideEventFilter;
   class UpdateShelfObserver;
   friend class AshPopupAlignmentDelegateTest;
   friend class ash::ScreenAsh;
   friend class PanelLayoutManagerTest;
@@ skipping 94 matching lines @@
   void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override;
 
   // Overridden from DockedWindowLayoutManagerObserver:
   void OnDockBoundsChanging(
       const gfx::Rect& dock_bounds,
       DockedWindowLayoutManagerObserver::Reason reason) override;
 
   // Called when the LoginUI changes from visible to invisible.
   void UpdateShelfVisibilityAfterLoginUIChange();
 
-  // Returns true when |alignment_| is locked. This can be caused by the screen
-  // being locked, or when adding a user. Returns false when transitioning to a
-  // user session, and while the session is active.
-  bool IsAlignmentLocked() const;
-
   // The RootWindow is cached so that we don't invoke Shell::GetInstance() from
   // our destructor. We avoid that as at the time we're deleted Shell is being
   // deleted too.
   aura::Window* root_window_;
 
   // True when inside UpdateBoundsAndOpacity() method. Used to prevent calling
   // UpdateBoundsAndOpacity() again from SetChildBounds().
   bool updating_bounds_;
 
-  // See description above setter.
-  ShelfAutoHideBehavior auto_hide_behavior_;
-
-  // See description above getter.
-  ShelfAlignment alignment_;
-
   // Current state.
   State state_;
 
   ShelfWidget* shelf_;
 
   WorkspaceController* workspace_controller_;
 
   // Do any windows overlap the shelf? This is maintained by WorkspaceManager.
   bool window_overlaps_shelf_;
 
@@ skipping 50 matching lines @@
 
   // The show hide animation duration override or 0 for default.
   int duration_override_in_ms_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_