Removes WmShelfAura and WmShelfMus

ash/aura/wm_root_window_controller_aura.cc

 // Copyright 2016 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/aura/wm_root_window_controller_aura.h"
 
-#include "ash/aura/wm_shelf_aura.h"
 #include "ash/aura/wm_shell_aura.h"
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_property.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/events/event_targeter.h"
 #include "ui/events/event_utils.h"
@@ skipping 34 matching lines @@
           kWmRootWindowControllerKey);
   if (wm_root_window_controller)
     return wm_root_window_controller;
 
   DCHECK_EQ(aura::Env::Mode::LOCAL, aura::Env::GetInstance()->mode());
   // WmRootWindowControllerAura is owned by the RootWindowController's window.
   return new WmRootWindowControllerAura(root_window_controller);
 }
 
 bool WmRootWindowControllerAura::HasShelf() {
-  return root_window_controller_->wm_shelf_aura()->shelf_widget() != nullptr;
+  return root_window_controller_->wm_shelf()->shelf_widget() != nullptr;
 }
 
 WmShell* WmRootWindowControllerAura::GetShell() {
   return WmShell::Get();
 }
 
 WmShelf* WmRootWindowControllerAura::GetShelf() {
-  return root_window_controller_->wm_shelf_aura();
+  return root_window_controller_->wm_shelf();
 }
 
 WmWindow* WmRootWindowControllerAura::GetWindow() {
   return WmWindowAura::Get(root_window_controller_->GetRootWindow());
 }
 
 void WmRootWindowControllerAura::ConfigureWidgetInitParamsForContainer(
     views::Widget* widget,
     int shell_container_id,
     views::Widget::InitParams* init_params) {
@@ skipping 31 matching lines @@
   root_window_controller_->OnWallpaperAnimationFinished(widget);
   WmRootWindowController::OnWallpaperAnimationFinished(widget);
 }
 
 bool WmRootWindowControllerAura::ShouldDestroyWindowInCloseChildWindows(
     WmWindow* window) {
   return WmWindowAura::GetAuraWindow(window)->owned_by_parent();
 }
 
 }  // namespace ash