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

ash/ash.gyp

 # Copyright (c) 2012 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.
 
 {
   'variables': {
     'chromium_code': 1,
     # These files lists are shared with the GN build.
     'ash_sources': [
       'accelerators/accelerator_commands.cc',
@@ skipping 33 matching lines @@
       'audio/sounds.cc',
       'audio/sounds.h',
       'autoclick/autoclick_controller.cc',
       'autoclick/autoclick_controller.h',
       'cancel_mode.cc',
       'cancel_mode.h',
       'cast_config_delegate.cc',
       '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',
       'common/wm/background_animator.cc',
       'common/wm/background_animator.h',
       'common/wm/container_finder.cc',
       'common/wm/container_finder.h',
       'common/wm/default_state.cc',
       'common/wm/default_state.h',
       'common/wm/default_window_resizer.cc',
       'common/wm/default_window_resizer.h',
       'common/wm/dock/docked_window_layout_manager.cc',
       'common/wm/dock/docked_window_layout_manager.h',
       'common/wm/dock/docked_window_layout_manager_observer.h',
       'common/wm/dock/docked_window_resizer.cc',
       'common/wm/dock/docked_window_resizer.h',
       'common/wm/drag_details.cc',
       'common/wm/drag_details.h',
       'common/wm/fullscreen_window_finder.cc',
       'common/wm/fullscreen_window_finder.h',
       'common/wm/panels/panel_layout_manager.cc',
       'common/wm/panels/panel_layout_manager.h',
       'common/wm/panels/panel_window_resizer.cc',
       'common/wm/panels/panel_window_resizer.h',
       'common/wm/root_window_finder.cc',
       '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',

[James Cook, 2016/06/03 19:40:57]

I'll do this one in a follow-up patch. Doing it in separate stages helps
preserve the rename history of the non-wm version of 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',
       'common/wm/window_parenting_utils.cc',
       'common/wm/window_parenting_utils.h',
       'common/wm/window_positioner.cc',
       'common/wm/window_positioner.h',
       'common/wm/window_positioning_utils.cc',
       'common/wm/window_positioning_utils.h',
       'common/wm/window_resizer.cc',
@@ skipping 233 matching lines @@
       'shelf/shelf.cc',
       'shelf/shelf.h',
       'shelf/shelf_alignment_menu.cc',
       'shelf/shelf_alignment_menu.h',
       'shelf/shelf_bezel_event_filter.cc',
       'shelf/shelf_bezel_event_filter.h',
       'shelf/shelf_button.cc',
       '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',
       'shelf/shelf_item_delegate_manager.cc',
       'shelf/shelf_item_delegate_manager.h',
       'shelf/shelf_item_types.cc',
       'shelf/shelf_item_types.h',
       'shelf/shelf_layout_manager.cc',
       'shelf/shelf_layout_manager.h',
       'shelf/shelf_layout_manager_observer.h',
       'shelf/shelf_locking_manager.cc',
       'shelf/shelf_locking_manager.h',
       'shelf/shelf_menu_model.h',
       'shelf/shelf_model.cc',
       'shelf/shelf_model.h',
       'shelf/shelf_model_observer.h',
       'shelf/shelf_navigator.cc',
       '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',
       'shelf/shelf_view.h',
       'shelf/shelf_widget.cc',
       'shelf/shelf_widget.h',
       'shelf/shelf_window_watcher.cc',
       'shelf/shelf_window_watcher.h',
       'shelf/shelf_window_watcher_item_delegate.cc',
       'shelf/shelf_window_watcher_item_delegate.h',
@@ skipping 1068 matching lines @@
                   '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
                 ],
               }
             ],
           ],
         },
       ],
     }],
   ],
 }