ash: Move ShelfWidget ownership to WmShelf and refactor access to it

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 38 matching lines @@
 }
 
 namespace ash {
 class AshWindowTreeHost;
 class AlwaysOnTopController;
 class AnimatingWallpaperWidgetController;
 class DockedWindowLayoutManager;
 enum class LoginStatus;
 class PanelLayoutManager;
 class ShelfLayoutManager;
-class ShelfWidget;
 class StackingController;
 class StatusAreaWidget;
 class SystemModalContainerLayoutManager;
 class SystemTray;
 class SystemWallpaperController;
 class TouchHudDebug;
 class TouchHudProjection;
 class WallpaperWidgetController;
 class WmRootWindowControllerAura;
 class WmShelfAura;
@@ skipping 41 matching lines @@
   const aura::Window* GetRootWindow() const;
 
   WorkspaceController* workspace_controller();
 
   AlwaysOnTopController* always_on_top_controller() {
     return always_on_top_controller_.get();
   }
 
   WmShelfAura* wm_shelf_aura() const { return wm_shelf_aura_.get(); }
 
-  // Access the shelf widget associated with this root window controller,
-  // NULL if no such shelf exists.
-  // DEPRECATED: Prefer GetShelf()->shelf_widget().
-  ShelfWidget* shelf_widget() { return shelf_widget_.get(); }
-
   // 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_;
   }
 
   // Set touch HUDs for this root window controller. The root window controller
   // will not own the HUDs; their lifetimes are managed by themselves. Whenever
   // the widget showing a HUD is being destroyed (e.g. because of detaching a
   // display), the HUD deletes itself.
   void set_touch_hud_debug(TouchHudDebug* hud) { touch_hud_debug_ = hud; }
   void set_touch_hud_projection(TouchHudProjection* hud) {
     touch_hud_projection_ = hud;
   }
 
   WallpaperWidgetController* wallpaper_widget_controller() {
     return wallpaper_widget_controller_.get();
   }
   void SetWallpaperWidgetController(WallpaperWidgetController* controller);
   AnimatingWallpaperWidgetController* animating_wallpaper_widget_controller() {
     return animating_wallpaper_widget_controller_.get();
   }
   void SetAnimatingWallpaperWidgetController(
       AnimatingWallpaperWidgetController* controller);
 
   // Access the shelf layout manager associated with this root
   // window controller, NULL if no such shelf exists.
   ShelfLayoutManager* GetShelfLayoutManager();
 
+  // May return null, for example for a secondary monitor at the login screen.
+  StatusAreaWidget* GetStatusAreaWidget();
+
   // Returns the system tray on this root window. Note that
   // calling this on the root window that doesn't have a shelf will
   // lead to a crash.
   SystemTray* GetSystemTray();
 
   // Shows context menu at the |location_in_screen|. This uses
   // |ShellDelegate::CreateContextMenu| to define the content of the menu.
   void ShowContextMenu(const gfx::Point& location_in_screen,
                        ui::MenuSourceType source_type);
 
@@ skipping 103 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_;
 
-  // 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.
   DockedWindowLayoutManager* docked_layout_manager_;
 
@@ skipping 34 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_