ash: Remove ash::Shelf in favor of ash::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;
 
 // 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:
   // Returns the shelf for the display that |window| is on. Note that the shelf
   // widget may not exist, or the shelf may not be visible.
   static WmShelf* ForWindow(WmWindow* window);
 
-  void SetShelf(Shelf* shelf);
-  void ClearShelf();
-  Shelf* shelf() const { return shelf_; }
-
+  // TODO(jamescook): Create the ShelfLayoutManager in this class.
   virtual void SetShelfLayoutManager(ShelfLayoutManager* manager);
   ShelfLayoutManager* shelf_layout_manager() const {
     return shelf_layout_manager_;
   }
 
   ShelfWidget* shelf_widget() { return shelf_widget_; }
 
+  // Creates the shelf view.
+  void InitializeShelf();
+  void ShutdownShelf();
+
+  // True after the ShelfView has been created (e.g. after login).
+  bool IsShelfInitialized() const;
+
   // Returns the window showing the shelf.
   WmWindow* GetWindow();
 
   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;
@@ skipping 77 matching lines @@
   ~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;
 
   // TODO(jamescook): Move ShelfWidget ownership here.
   ShelfWidget* shelf_widget_ = nullptr;
 
+  // Internal implementation detail. Do not expose externally. Owned by views
+  // hierarchy. Null before login and in secondary display init.
+  ShelfView* shelf_view_ = nullptr;
+
   ShelfAlignment alignment_ = SHELF_ALIGNMENT_BOTTOM_LOCKED;
 
   // Sets shelf alignment to bottom during login and screen lock.
   std::unique_ptr<ShelfLockingManager> shelf_locking_manager_;
 
   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_