ash: Remove ash::Shelf in favor of ash::WmShelf

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/aura/aura_layout_manager_adapter.h"
 #include "ash/aura/wm_shelf_aura.h"
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/ash_constants.h"
 #include "ash/common/ash_switches.h"
 #include "ash/common/focus_cycler.h"
 #include "ash/common/login_status.h"
 #include "ash/common/root_window_controller_common.h"
 #include "ash/common/session/session_state_delegate.h"
-#include "ash/common/shelf/shelf.h"
 #include "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/shelf/shelf_layout_manager.h"
 #include "ash/common/shelf/shelf_types.h"
 #include "ash/common/shelf/shelf_widget.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/status_area_layout_manager.h"
 #include "ash/common/system/status_area_widget.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/wallpaper/wallpaper_delegate.h"
@@ skipping 427 matching lines @@
 
 aura::Window* RootWindowController::GetContainer(int container_id) {
   return GetRootWindow()->GetChildById(container_id);
 }
 
 const aura::Window* RootWindowController::GetContainer(int container_id) const {
   return ash_host_->AsWindowTreeHost()->window()->GetChildById(container_id);
 }
 
 void RootWindowController::ShowShelf() {
-  if (!shelf_)
+  if (!wm_shelf_aura_->IsShelfCreated())
     return;
+  // TODO(jamescook): Move this into WmShelf.
   shelf_widget_->SetShelfVisibility(true);
   shelf_widget_->status_area_widget()->Show();
 }
 
 void RootWindowController::CreateShelf() {
-  if (shelf_)
+  if (wm_shelf_aura_->IsShelfCreated())
     return;
-  ShelfView* shelf_view = shelf_widget_->CreateShelfView();
-
-  shelf_.reset(
-      new Shelf(wm_shelf_aura_.get(), shelf_view, shelf_widget_.get()));
-  shelf_widget_->set_shelf(shelf_.get());
-  // Must be initialized before the delegate is notified because the delegate
-  // may try to access the WmShelf.
-  wm_shelf_aura_->SetShelf(shelf_.get());
-  WmShell::Get()->shelf_delegate()->OnShelfCreated(wm_shelf_aura_.get());
+  wm_shelf_aura_->CreateShelf();
 
   if (panel_layout_manager_)
     panel_layout_manager_->SetShelf(wm_shelf_aura_.get());
   if (docked_layout_manager_) {
     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.

[msw, 2016/08/30 22:02:07]

nit: I wonder if we can order this and PostCreateShelf before the layout manager
stuff immediately above; then we could move both of these statements into
WmShelf::CreateShelf (it kinda makes sense to call those there). Okay to leave
for later; but nice if we can do it now.

[James Cook, 2016/08/30 23:00:57]

I'm going to do this in a follow-up CL. It turns out that
NotifyShelfCreatedForRootWindow() calls into AttachedPanelWindowTargeter which
assumes that PanelLayoutManager has a WmShelf set. This is fixable, but it's a
bit more involved than I want to include in this CL. Added TODO.

   WmShell::Get()->NotifyShelfCreatedForRootWindow(
       WmWindowAura::Get(GetRootWindow()));
 
   shelf_widget_->PostCreateShelf();
 }
 
-Shelf* RootWindowController::GetShelf() const {
-  return shelf_.get();
-}
-
 void RootWindowController::UpdateAfterLoginStatusChange(LoginStatus status) {
   if (status != LoginStatus::NOT_LOGGED_IN)
     mouse_event_target_.reset();
   if (shelf_widget_->status_area_widget())
     shelf_widget_->status_area_widget()->UpdateAfterLoginStatusChange(status);
 }
 
 void RootWindowController::HandleInitialWallpaperAnimationStarted() {
 #if defined(OS_CHROMEOS)
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
@@ skipping 90 matching lines @@
     aura::Window* window = root_window->children()[0];
     if (window->owned_by_parent()) {
       delete window;
     } else {
       root_window->RemoveChild(window);
     }
   }
 
   shelf_widget_.reset();
   // CloseChildWindows may be called twice during the shutdown of ash unittests.
-  // Avoid notifying WmShelf that the Shelf instance has been destroyed twice.
-  if (wm_shelf_aura_->shelf())
-    wm_shelf_aura_->ClearShelf();
-  shelf_.reset();
+  // Avoid notifying WmShelf that the shelf has been destroyed twice.
+  if (wm_shelf_aura_->IsShelfCreated())
+    wm_shelf_aura_->DestroyShelf();
 }
 
 void RootWindowController::MoveWindowsTo(aura::Window* dst) {
   // Clear the workspace controller, so it doesn't incorrectly update the shelf.
   root_window_controller_common_->DeleteWorkspaceController();
   ReparentAllWindows(GetRootWindow(), dst);
 }
 
 ShelfLayoutManager* RootWindowController::GetShelfLayoutManager() {
   return shelf_widget_->shelf_layout_manager();
@@ skipping 322 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