mash: Move WmShelfAura ownership to RootWindowController and init it earlier

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 49 matching lines @@
 class Shelf;
 class ShelfLayoutManager;
 class ShelfWidget;
 class StackingController;
 class StatusAreaWidget;
 class SystemBackgroundController;
 class SystemModalContainerLayoutManager;
 class SystemTray;
 class TouchHudDebug;
 class TouchHudProjection;
+class WmShelfAura;
 class WmWindow;
 class WorkspaceController;
 
 #if defined(OS_CHROMEOS)
 class BootSplashScreen;
 class AshTouchExplorationManager;
 #endif
 
 // This class maintains the per root window state for ash. This class
 // owns the root window and other dependent objects that should be
@@ skipping 31 matching lines @@
   const aura::Window* GetRootWindow() const;
 
   WorkspaceController* workspace_controller() {
     return workspace_controller_.get();
   }
 
   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 {
@@ skipping 48 matching lines @@
   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(user::LoginStatus status);
 
   // Called when the brightness/grayscale animation from white to the login
   // desktop background image has started.  Starts |boot_splash_screen_|'s
   // hiding animation (if the screen is non-NULL).
   void HandleInitialDesktopBackgroundAnimationStarted();
@@ skipping 69 matching lines @@
   // Overridden from ShellObserver.
   void OnLoginStateChanged(user::LoginStatus status) override;
   void OnTouchHudProjectionToggled(bool enabled) override;
 
   std::unique_ptr<AshWindowTreeHost> ash_host_;
 
   std::unique_ptr<RootWindowControllerCommon> root_window_controller_common_;
 
   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.
   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 |LockScreenBackgroundContainer| and
   // this must be deleted before the container is deleted.
   std::unique_ptr<aura::Window> mouse_event_target_;
 
@@ skipping 37 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_