Removes WmShelfAura and WmShelfMus

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 36 matching lines @@
 enum class LoginStatus;
 class PanelLayoutManager;
 class ShelfLayoutManager;
 class StackingController;
 class StatusAreaWidget;
 class SystemTray;
 class SystemWallpaperController;
 class TouchHudDebug;
 class TouchHudProjection;
 class WmRootWindowControllerAura;
-class WmShelfAura;
+class WmShelf;
 class WorkspaceController;
 
 // This class maintains the per root window state for ash. This class
 // owns the root window and other dependent objects that should be
 // deleted upon the deletion of the root window. This object is
 // indirectly owned and deleted by |WindowTreeHostManager|.
 // The RootWindowController for particular root window is stored in
 // its property (RootWindowSettings) and can be obtained using
 // |GetRootWindowController(aura::WindowEventDispatcher*)| function.
 //
@@ skipping 19 matching lines @@
   AshWindowTreeHost* ash_host() { return ash_host_.get(); }
   const AshWindowTreeHost* ash_host() const { return ash_host_.get(); }
 
   aura::WindowTreeHost* GetHost();
   const aura::WindowTreeHost* GetHost() const;
   aura::Window* GetRootWindow();
   const aura::Window* GetRootWindow() const;
 
   WorkspaceController* workspace_controller();
 
-  WmShelfAura* wm_shelf_aura() const { return wm_shelf_aura_.get(); }
+  WmShelf* wm_shelf() const { return wm_shelf_.get(); }
 
   WmRootWindowControllerAura* wm_root_window_controller() {
     return wm_root_window_controller_;
   }
 
   // Get touch HUDs associated with this root window controller.
   TouchHudDebug* touch_hud_debug() const { return touch_hud_debug_; }
   TouchHudProjection* touch_hud_projection() const {
     return touch_hud_projection_;
   }
@@ skipping 101 matching lines @@
   std::unique_ptr<AshWindowTreeHost> ash_host_;
 
   // 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_;
+  std::unique_ptr<WmShelf> wm_shelf_;
 
   std::unique_ptr<SystemWallpaperController> system_wallpaper_;
 
   std::unique_ptr<BootSplashScreen> boot_splash_screen_;
   // Responsible for initializing TouchExplorationController when spoken
   // feedback is on.
   std::unique_ptr<AshTouchExplorationManager> touch_exploration_manager_;
 
   // Heads-up displays for touch events. These HUDs are not owned by the root
   // window controller and manage their own lifetimes.
@@ skipping 10 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_