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

ash/aura/wm_root_window_controller_aura.h

 // 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.
 
 #ifndef ASH_AURA_WM_ROOT_CONTROLLER_AURA_H_
 #define ASH_AURA_WM_ROOT_CONTROLLER_AURA_H_
 
 #include "ash/ash_export.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/shell_observer.h"
@@ skipping 19 matching lines @@
     return const_cast<WmRootWindowControllerAura*>(
         Get(const_cast<const aura::Window*>(window)));
   }
   static const WmRootWindowControllerAura* Get(const aura::Window* window);
 
   // WmRootWindowController:
   bool HasShelf() override;
   WmShell* GetShell() override;
   wm::WorkspaceWindowState GetWorkspaceWindowState() override;
   AlwaysOnTopController* GetAlwaysOnTopController() override;
-  wm::WmShelf* GetShelf() override;
+  WmShelf* GetShelf() override;
   WmWindow* GetWindow() override;
   void ConfigureWidgetInitParamsForContainer(
       views::Widget* widget,
       int shell_container_id,
       views::Widget::InitParams* init_params) override;
   WmWindow* FindEventTarget(const gfx::Point& location_in_screen) override;
   void AddObserver(WmRootWindowControllerObserver* observer) override;
   void RemoveObserver(WmRootWindowControllerObserver* observer) override;
 
   // ShellObserver:
   void OnDisplayWorkAreaInsetsChanged() override;
   void OnFullscreenStateChanged(bool is_fullscreen,
                                 aura::Window* root_window) override;
   void OnShelfAlignmentChanged(aura::Window* root_window) override;
 
  private:
   RootWindowController* root_window_controller_;
   base::ObserverList<WmRootWindowControllerObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(WmRootWindowControllerAura);
 };
 
 }  // namespace ash
 
 #endif  // ASH_AURA_WM_ROOT_CONTROLLER_AURA_H_