Removes WmShelfAura and WmShelfMus

ash/mus/root_window_controller.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/mus/root_window_controller.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <map>
 #include <sstream>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "ash/common/shelf/shelf_layout_manager.h"
+#include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/wm/container_finder.h"
 #include "ash/common/wm/dock/docked_window_layout_manager.h"
 #include "ash/common/wm/panels/panel_layout_manager.h"
 #include "ash/common/wm/root_window_layout_manager.h"
 #include "ash/mus/bridge/wm_root_window_controller_mus.h"
-#include "ash/mus/bridge/wm_shelf_mus.h"
 #include "ash/mus/bridge/wm_shell_mus.h"
 #include "ash/mus/bridge/wm_window_mus.h"
 #include "ash/mus/non_client_frame_controller.h"
 #include "ash/mus/property_util.h"
 #include "ash/mus/screen_mus.h"
 #include "ash/mus/window_manager.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/wm/stacking_controller.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 28 matching lines @@
 }  // namespace
 
 RootWindowController::RootWindowController(
     WindowManager* window_manager,
     std::unique_ptr<aura::WindowTreeHostMus> window_tree_host,
     const display::Display& display)
     : window_manager_(window_manager),
       window_tree_host_(std::move(window_tree_host)),
       window_count_(0),
       display_(display),
-      wm_shelf_(base::MakeUnique<WmShelfMus>()) {
+      wm_shelf_(base::MakeUnique<WmShelf>()) {
   wm_root_window_controller_ = base::MakeUnique<WmRootWindowControllerMus>(
       window_manager_->shell(), this);
   wm_root_window_controller_->CreateContainers();
   wm_root_window_controller_->CreateLayoutManagers();
 
   parenting_client_ = base::MakeUnique<StackingController>();
   aura::client::SetWindowParentingClient(root(), parenting_client_.get());
 
   disconnected_app_handler_.reset(new DisconnectedAppHandler(root()));
 
@@ skipping 149 matching lines @@
   } else {
     width = root()->bounds().width() - 240;
     height = root()->bounds().height() - 240;
   }
   return gfx::Rect(40 + (window_count_ % 4) * 40, 40 + (window_count_ % 4) * 40,
                    width, height);
 }
 
 }  // namespace mus
 }  // namespace ash