mash: Move more shelf files to ash/common/shelf.

ash/ash.gyp

Index: ash/ash.gyp
diff --git a/ash/ash.gyp b/ash/ash.gyp
index 2e47166c0bcb430bee2fc382e97b00268bd4e7f9..cc2992c6445e73984c619d41d61bd643e46d41dc 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -132,6 +132,8 @@
       'common/shelf/overflow_bubble_view.h',
       'common/shelf/overflow_button.cc',
       'common/shelf/overflow_button.h',
+      'common/shelf/shelf.cc',
+      'common/shelf/shelf.h',
       'common/shelf/shelf_alignment_menu.cc',
       'common/shelf/shelf_alignment_menu.h',
       'common/shelf/shelf_background_animator.cc',
@@ -147,6 +149,9 @@
       'common/shelf/shelf_item_delegate.h',
       'common/shelf/shelf_item_types.cc',
       'common/shelf/shelf_item_types.h',
+      'common/shelf/shelf_layout_manager.cc',
+      'common/shelf/shelf_layout_manager.h',
+      'common/shelf/shelf_layout_manager_observer.h',
       'common/shelf/shelf_locking_manager.cc',
       'common/shelf/shelf_locking_manager.h',
       'common/shelf/shelf_menu_model.h',
@@ -160,6 +165,8 @@
       'common/shelf/shelf_types.h',
       'common/shelf/shelf_view.cc',
       'common/shelf/shelf_view.h',
+      'common/shelf/shelf_widget.cc',
+      'common/shelf/shelf_widget.h',
       'common/shelf/shelf_window_watcher.cc',
       'common/shelf/shelf_window_watcher.h',
       'common/shelf/shelf_window_watcher_item_delegate.cc',
@@ -304,6 +311,8 @@
       'common/system/networking_config_delegate.h',
       'common/system/overview/overview_button_tray.cc',
       'common/system/overview/overview_button_tray.h',
+      'common/system/status_area_layout_manager.cc',
+      'common/system/status_area_layout_manager.h',
       'common/system/status_area_widget.cc',
       'common/system/status_area_widget.h',
       'common/system/status_area_widget_delegate.cc',
@@ -656,17 +665,10 @@
       'shared/immersive_revealed_lock.h',
       'shelf/dimmer_view.cc',
       'shelf/dimmer_view.h',
-      'shelf/shelf.cc',
-      'shelf/shelf.h',
       'shelf/shelf_bezel_event_handler.cc',
       'shelf/shelf_bezel_event_handler.h',
-      'shelf/shelf_layout_manager.cc',
-      'shelf/shelf_layout_manager.h',
-      'shelf/shelf_layout_manager_observer.h',
       'shelf/shelf_util.cc',
       'shelf/shelf_util.h',
-      'shelf/shelf_widget.cc',
-      'shelf/shelf_widget.h',
       'shelf/shelf_window_targeter.cc',
       'shelf/shelf_window_targeter.h',
       'shell.cc',
@@ -770,8 +772,6 @@
       'wm/session_state_animator_impl.h',
       'wm/stacking_controller.cc',
       'wm/stacking_controller.h',
-      'wm/status_area_layout_manager.cc',
-      'wm/status_area_layout_manager.h',
       'wm/system_background_controller.cc',
       'wm/system_background_controller.h',
       'wm/system_gesture_event_filter.cc',