ash: Move alignment and autohide behavior from Shelf to WmShelf

ash/common/shelf/wm_shelf.h

 // Copyright 2016 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_COMMON_SHELF_WM_SHELF_H_
 #define ASH_COMMON_SHELF_WM_SHELF_H_
 
+#include <memory>
+
 #include "ash/ash_export.h"
 #include "ash/common/shelf/shelf_layout_manager_observer.h"
 #include "ash/common/shelf/shelf_types.h"
 #include "base/observer_list.h"
 
 namespace gfx {
 class Rect;
 }
 
 namespace ui {
 class GestureEvent;
 }
 
 namespace ash {
 
 class Shelf;
 class ShelfLayoutManager;
 class ShelfLockingManager;
 class ShelfView;
+class ShelfWidget;
 class StatusAreaWidget;
 class WmDimmerView;
 class WmShelfObserver;
 class WmWindow;
 
-// Used for accessing global state.
+// Controller for the shelf state. Exists for the lifetime of each root window
+// controller. Note that the shelf widget may not be created until after login.
 class ASH_EXPORT WmShelf : public ShelfLayoutManagerObserver {
  public:
   void SetShelf(Shelf* shelf);
   void ClearShelf();
   Shelf* shelf() const { return shelf_; }
 
   virtual void SetShelfLayoutManager(ShelfLayoutManager* manager);
   ShelfLayoutManager* shelf_layout_manager() const {
     return shelf_layout_manager_;
   }
 
   // Returns the window showing the shelf.
   WmWindow* GetWindow();
 
-  ShelfAlignment GetAlignment() const;
+  ShelfAlignment alignment() const { return alignment_; }
+  // TODO(jamescook): Replace with alignment().
+  ShelfAlignment GetAlignment() const { return alignment_; }
   void SetAlignment(ShelfAlignment alignment);
 
   // Returns true if the shelf alignment is horizontal (i.e. at the bottom).
   bool IsHorizontalAlignment() const;
 
   // Returns a value based on shelf alignment.
   int SelectValueForShelfAlignment(int bottom, int left, int right) const;
 
   // Returns |horizontal| is shelf is horizontal, otherwise |vertical|.
   int PrimaryAxisValue(int horizontal, int vertical) const;
 
-  ShelfAutoHideBehavior GetAutoHideBehavior() const;
+  ShelfAutoHideBehavior auto_hide_behavior() const {
+    return auto_hide_behavior_;
+  }
   void SetAutoHideBehavior(ShelfAutoHideBehavior behavior);
 
   ShelfAutoHideState GetAutoHideState() const;
 
   // Invoke when the auto-hide state may have changed (for example, when the
   // system tray bubble opens it should force the shelf to be visible).
   void UpdateAutoHideState();
 
   ShelfBackgroundType GetBackgroundType() const;
 
@@ skipping 35 matching lines @@
 
   void AddObserver(WmShelfObserver* observer);
   void RemoveObserver(WmShelfObserver* observer);
 
   void NotifyShelfIconPositionsChanged();
   StatusAreaWidget* GetStatusAreaWidget() const;
 
   void SetVirtualKeyboardBoundsForTesting(const gfx::Rect& bounds);
   ShelfLockingManager* GetShelfLockingManagerForTesting();
   ShelfView* GetShelfViewForTesting();
+  ShelfWidget* GetShelfWidgetForTesting();
 
  protected:
   WmShelf();
   ~WmShelf() override;
 
   // ShelfLayoutManagerObserver:
   void WillDeleteShelfLayoutManager() override;
   void WillChangeVisibilityState(ShelfVisibilityState new_state) override;
   void OnAutoHideStateChanged(ShelfAutoHideState new_state) override;
   void OnBackgroundUpdated(ShelfBackgroundType background_type,
                            BackgroundAnimatorChangeType change_type) override;
 
  private:
   // Legacy shelf controller. Null before login and in secondary display init.
   // Instance lifetimes are managed by ash::RootWindowController and WmShelfMus.
   Shelf* shelf_ = nullptr;
 
   // Layout manager for the shelf container window. Instances are constructed by
   // ShelfWidget and lifetimes are managed by the container windows themselves.
   ShelfLayoutManager* shelf_layout_manager_ = nullptr;
 
+  ShelfAlignment alignment_ = SHELF_ALIGNMENT_BOTTOM_LOCKED;
+
+  // Sets shelf alignment to bottom during login and screen lock.
+  std::unique_ptr<ShelfLockingManager> shelf_locking_manager_;

[msw, 2016/08/24 00:18:59]

Too bad this needs to be a unique_ptr now. We could avoid that if its
SetAlignment calls didn't occur outside the lifetime of the shelf
widget/layout_manager, or if WmShelf handled those cases gracefully, but w/e.

+
+  ShelfAutoHideBehavior auto_hide_behavior_ = SHELF_AUTO_HIDE_BEHAVIOR_NEVER;
+
   base::ObserverList<WmShelfObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(WmShelf);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SHELF_WM_SHELF_H_