mash: Move WmShelfAura ownership to RootWindowController and init it earlier

ash/root_window_controller.cc

 // 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.
 
 #include "ash/root_window_controller.h"
 
 #include <queue>
 #include <vector>
 
 #include "ash/ash_constants.h"
@@ skipping 385 matching lines @@
 void RootWindowController::ShowShelf() {
   if (!shelf_widget_->shelf())
     return;
   shelf_widget_->shelf()->SetVisible(true);
   shelf_widget_->status_area_widget()->Show();
 }
 
 void RootWindowController::CreateShelf() {
   if (shelf_widget_->shelf())
     return;
-  shelf_widget_->CreateShelf();
+  shelf_widget_->CreateShelf(wm_shelf_aura_.get());
 
   if (panel_layout_manager_)
-    panel_layout_manager_->SetShelf(shelf_widget_->shelf()->wm_shelf());
+    panel_layout_manager_->SetShelf(wm_shelf_aura_.get());
   if (docked_layout_manager_) {
-    docked_layout_manager_->SetShelf(shelf_widget_->shelf()->wm_shelf());
+    docked_layout_manager_->SetShelf(wm_shelf_aura_.get());
     if (shelf_widget_->shelf_layout_manager())
       docked_layout_manager_->AddObserver(
           shelf_widget_->shelf_layout_manager());
   }
 
   // Notify shell observers that the shelf has been created.
   Shell::GetInstance()->OnShelfCreatedForRootWindow(GetRootWindow());
 
   shelf_widget_->PostCreateShelf();
 }
@@ skipping 71 matching lines @@
   if (docked_layout_manager_) {
     docked_layout_manager_->Shutdown();
     docked_layout_manager_ = NULL;
   }
   aura::Window* root_window = GetRootWindow();
   aura::client::SetDragDropClient(root_window, NULL);
 
   if (shelf_widget_)
     shelf_widget_->Shutdown();
 
+  wm_shelf_aura_->Shutdown();
+
   // Close background widget first as it depends on tooltip.
   wallpaper_controller_.reset();
   animating_wallpaper_controller_.reset();
 
   workspace_controller_.reset();
   aura::client::SetTooltipClient(root_window, NULL);
 
   // Explicitly destroy top level windows. We do this as during part of
   // destruction such windows may query the RootWindow for state.
   aura::WindowTracker non_toplevel_windows;
@@ skipping 143 matching lines @@
   if (touch_exploration_manager_)
     touch_exploration_manager_->SetTouchAccessibilityAnchorPoint(anchor_point);
 #endif  // defined(OS_CHROMEOS)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // RootWindowController, private:
 
 RootWindowController::RootWindowController(AshWindowTreeHost* ash_host)
     : ash_host_(ash_host),
+      wm_shelf_aura_(new WmShelfAura),
       docked_layout_manager_(NULL),
       panel_layout_manager_(NULL),
       touch_hud_debug_(NULL),
       touch_hud_projection_(NULL) {
   aura::Window* root_window = GetRootWindow();
   root_window_controller_common_.reset(
       new RootWindowControllerCommon(WmWindowAura::Get(root_window)));
   GetRootWindowSettings(root_window)->controller = this;
 
   stacking_controller_.reset(new StackingController);
@@ skipping 79 matching lines @@
   always_on_top_controller_.reset(
       new AlwaysOnTopController(always_on_top_container));
 
   DCHECK(!shelf_widget_.get());
   WmWindow* shelf_container =
       WmWindowAura::Get(GetContainer(kShellWindowId_ShelfContainer));
   WmWindow* status_container =
       WmWindowAura::Get(GetContainer(kShellWindowId_StatusContainer));
   shelf_widget_.reset(new ShelfWidget(shelf_container, status_container,
                                       workspace_controller()));
+  wm_shelf_aura_->SetShelfLayoutManager(shelf_widget_->shelf_layout_manager());
   workspace_layout_manager_delegate->set_shelf(
       shelf_widget_->shelf_layout_manager());
 
   if (!Shell::GetInstance()->session_state_delegate()->
       IsActiveUserSessionStarted()) {
     // This window exists only to be a event target on login screen.
     // It does not have to handle events, nor be visible.
     mouse_event_target_.reset(new aura::Window(new EmptyWindowDelegate));
     mouse_event_target_->Init(ui::LAYER_NOT_DRAWN);
 
@@ skipping 108 matching lines @@
     aura::Window* primary_root_window = Shell::GetInstance()
                                             ->window_tree_host_manager()
                                             ->GetPrimaryRootWindow();
     return GetRootWindowSettings(primary_root_window)->controller;
   }
 
   return GetRootWindowSettings(root_window)->controller;
 }
 
 }  // namespace ash