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

ash/ash.gyp

Index: ash/ash.gyp
diff --git a/ash/ash.gyp b/ash/ash.gyp
index 7a9c9982e2b9e6276560acf4bed104915632e9bd..b4e29cb9974a57f8aed7a1260b079e5759b20fd4 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -63,6 +63,13 @@
       'cast_config_delegate.h',
       'common/root_window_controller_common.cc',
       'common/root_window_controller_common.h',
+      'common/shelf/shelf_constants.cc',
+      'common/shelf/shelf_constants.h',
+      'common/shelf/shelf_types.h',
+      'common/shelf/wm_shelf.h',
+      'common/shelf/wm_shelf_observer.h',
+      'common/shelf/wm_shelf_util.cc',
+      'common/shelf/wm_shelf_util.h',
       'common/shell_window_ids.h',
       'common/wm/always_on_top_controller.cc',
       'common/wm/always_on_top_controller.h',
@@ -91,13 +98,7 @@
       'common/wm/root_window_finder.h',
       'common/wm/root_window_layout_manager.cc',
       'common/wm/root_window_layout_manager.h',
-      'common/wm/shelf/wm_shelf.h',
-      'common/wm/shelf/wm_shelf_constants.cc',
-      'common/wm/shelf/wm_shelf_constants.h',
-      'common/wm/shelf/wm_shelf_observer.h',
       'common/wm/shelf/wm_shelf_types.h',
-      'common/wm/shelf/wm_shelf_util.cc',
-      'common/wm/shelf/wm_shelf_util.h',
       'common/wm/switchable_windows.cc',
       'common/wm/switchable_windows.h',
       'common/wm/window_animation_types.h',
@@ -351,8 +352,6 @@
       'shelf/shelf_button.h',
       'shelf/shelf_button_pressed_metric_tracker.cc',
       'shelf/shelf_button_pressed_metric_tracker.h',
-      'shelf/shelf_constants.cc',
-      'shelf/shelf_constants.h',
       'shelf/shelf_delegate.h',
       'shelf/shelf_icon_observer.h',
       'shelf/shelf_item_delegate.h',
@@ -373,7 +372,6 @@
       'shelf/shelf_navigator.h',
       'shelf/shelf_tooltip_manager.cc',
       'shelf/shelf_tooltip_manager.h',
-      'shelf/shelf_types.h',
       'shelf/shelf_util.cc',
       'shelf/shelf_util.h',
       'shelf/shelf_view.cc',