chromeos: Move files in //ash/common to //ash, part 2

ash/shelf/wm_shelf.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_COMMON_SHELF_WM_SHELF_H_
-#define ASH_COMMON_SHELF_WM_SHELF_H_
+#ifndef ASH_SHELF_WM_SHELF_H_
+#define ASH_SHELF_WM_SHELF_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
-#include "ash/common/shelf/shelf_layout_manager_observer.h"
 #include "ash/public/cpp/shelf_types.h"
+#include "ash/shelf/shelf_layout_manager_observer.h"
 #include "base/observer_list.h"
 
 namespace gfx {
 class Rect;
 }
 
 namespace ui {
 class GestureEvent;
 }
 
@@ skipping 155 matching lines @@
 
   // Forwards touch gestures on a bezel sensor to the shelf.
   // TODO(mash): Facilitate simliar functionality in mash: crbug.com/636647
   std::unique_ptr<ShelfBezelEventHandler> bezel_event_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(WmShelf);
 };
 
 }  // namespace ash
 
-#endif  // ASH_COMMON_SHELF_WM_SHELF_H_
+#endif  // ASH_SHELF_WM_SHELF_H_