ash: Remove ash::Shelf in favor of ash::WmShelf

ash/root_window_controller.h

 // Copyright (c) 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_ROOT_WINDOW_CONTROLLER_H_
 #define ASH_ROOT_WINDOW_CONTROLLER_H_
 
 #include <map>
 #include <memory>
 
@@ skipping 37 matching lines @@
 class ScopedCaptureClient;
 }
 
 namespace ash {
 class AshWindowTreeHost;
 class AlwaysOnTopController;
 class AnimatingWallpaperWidgetController;
 class DockedWindowLayoutManager;
 enum class LoginStatus;
 class PanelLayoutManager;
-class Shelf;
 class ShelfLayoutManager;
 class ShelfWidget;
 class StackingController;
 class StatusAreaWidget;
 class SystemModalContainerLayoutManager;
 class SystemTray;
 class SystemWallpaperController;
 class TouchHudDebug;
 class TouchHudProjection;
 class WallpaperWidgetController;
@@ skipping 110 matching lines @@
   aura::Window* GetContainer(int container_id);
   const aura::Window* GetContainer(int container_id) const;
 
   // Show shelf view if it was created hidden (before session has started).
   // TODO(jamescook): Eliminate this and handle show via Shelf.
   void ShowShelf();
 
   // Creates the shelf for this root window and notifies observers.
   void CreateShelf();
 
-  // Returns the shelf controller for this root window.
-  // TODO(jamescook): Remove this and use WmRootWindowController::GetShelf().
-  Shelf* GetShelf() const;
-
   // Called when the login status changes after login (such as lock/unlock).
   // TODO(oshima): Investigate if we can merge this and |OnLoginStateChanged|.
   void UpdateAfterLoginStatusChange(LoginStatus status);
 
   // Called when the brightness/grayscale animation from white to the login
   // wallpaper image has started.  Starts |boot_splash_screen_|'s hiding
   // animation (if the screen is non-NULL).
   void HandleInitialWallpaperAnimationStarted();
 
   // Called when the wallpaper animation is finished. Updates
@@ skipping 70 matching lines @@
   // Owned by the root window.
   WmRootWindowControllerAura* wm_root_window_controller_ = nullptr;
 
   std::unique_ptr<StackingController> stacking_controller_;
 
   // The shelf controller for this root window. Exists for the entire lifetime
   // of the RootWindowController so that it is safe for observers to be added
   // to it during construction of the shelf widget and status tray.
   std::unique_ptr<WmShelfAura> wm_shelf_aura_;
 
-  // Legacy shelf controller. Only present after shelf is created (post-login).
-  std::unique_ptr<Shelf> shelf_;
-
   // The shelf widget for this root window.
+  // TODO(jamescook): Move ownership to WmShelf.
   std::unique_ptr<ShelfWidget> shelf_widget_;
 
   // An invisible/empty window used as a event target for
   // |MouseCursorEventFilter| before a user logs in.
   // (crbug.com/266987)
   // Its container is |LockScreenWallpaperContainer| and
   // this must be deleted before the container is deleted.
   std::unique_ptr<aura::Window> mouse_event_target_;
 
   // Manages layout of docked windows. Owned by DockedContainer.
@@ skipping 36 matching lines @@
 
 // On classic ash, returns the RootWindowController for the given |root_window|.
 // On mus ash, returns the RootWindowController for the primary display.
 // See RootWindowController class comment above.
 ASH_EXPORT RootWindowController* GetRootWindowController(
     const aura::Window* root_window);
 
 }  // namespace ash
 
 #endif  // ASH_ROOT_WINDOW_CONTROLLER_H_