mash: Move ash/common/wm/shelf to ash/common/shelf

ash/mus/bridge/wm_root_window_controller_mus.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/bridge/wm_root_window_controller_mus.h"
 
 #include "ash/common/wm_root_window_controller_observer.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"
@@ skipping 78 matching lines @@
 
 wm::WorkspaceWindowState WmRootWindowControllerMus::GetWorkspaceWindowState() {
   NOTIMPLEMENTED();
   return wm::WORKSPACE_WINDOW_STATE_DEFAULT;
 }
 
 AlwaysOnTopController* WmRootWindowControllerMus::GetAlwaysOnTopController() {
   return root_window_controller_->always_on_top_controller();
 }
 
-wm::WmShelf* WmRootWindowControllerMus::GetShelf() {
+WmShelf* WmRootWindowControllerMus::GetShelf() {
   return root_window_controller_->wm_shelf();
 }
 
 WmWindow* WmRootWindowControllerMus::GetWindow() {
   return WmWindowMus::Get(root_window_controller_->root());
 }
 
 void WmRootWindowControllerMus::ConfigureWidgetInitParamsForContainer(
     views::Widget* widget,
     int shell_container_id,
@@ skipping 22 matching lines @@
   observers_.AddObserver(observer);
 }
 
 void WmRootWindowControllerMus::RemoveObserver(
     WmRootWindowControllerObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 }  // namespace mus
 }  // namespace ash