chromeos: Rename ash::WmShelf to Shelf

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>
 #include <vector>
@@ skipping 35 matching lines @@
 }
 
 namespace ash {
 class AlwaysOnTopController;
 class AnimatingWallpaperWidgetController;
 class AshTouchExplorationManager;
 class AshWindowTreeHost;
 class BootSplashScreen;
 enum class LoginStatus;
 class PanelLayoutManager;
+class Shelf;
 class ShelfLayoutManager;
 class StackingController;
 class StatusAreaWidget;
 class SystemModalContainerLayoutManager;
 class SystemTray;
 class SystemWallpaperController;
 class TouchHudDebug;
 class TouchHudProjection;
 class WallpaperWidgetController;
-class WmShelf;
 class WorkspaceController;
 
 namespace mus {
 class WindowManager;
 }
 
 namespace wm {
 class RootWindowLayoutManager;
 }
 
@@ skipping 54 matching lines @@
         const_cast<const RootWindowController*>(this)->GetWindow());
   }
   const WmWindow* GetWindow() const;
 
   WorkspaceController* workspace_controller() {
     return workspace_controller_.get();
   }
 
   wm::WorkspaceWindowState GetWorkspaceWindowState();
 
-  WmShelf* wm_shelf() const { return wm_shelf_.get(); }
-  // TODO(jamescook): Eliminate in favor of wm_shelf().
-  WmShelf* GetShelf() const { return wm_shelf_.get(); }
+  Shelf* shelf() const { return shelf_.get(); }
+  // TODO(jamescook): Eliminate in favor of shelf().
+  Shelf* GetShelf() const { return shelf_.get(); }
 
   // Initializes the shelf for this root window and notifies observers.
   void InitializeShelf();
 
   // 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 188 matching lines @@
   // Manages the context menu.
   std::unique_ptr<ui::MenuModel> menu_model_;
   std::unique_ptr<views::MenuModelAdapter> menu_model_adapter_;
   std::unique_ptr<views::MenuRunner> menu_runner_;
 
   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<WmShelf> wm_shelf_;
+  std::unique_ptr<Shelf> shelf_;
 
   // TODO(jamescook): Eliminate this. It is left over from legacy shelf code and
   // doesn't mean anything in particular.
   bool shelf_initialized_ = false;
 
   std::unique_ptr<SystemWallpaperController> system_wallpaper_;
 
   std::unique_ptr<BootSplashScreen> boot_splash_screen_;
   // Responsible for initializing TouchExplorationController when spoken
   // feedback is on.
@@ skipping 16 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_