mash: Move wm_shelf_types.h into shelf_types.h

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 80 matching lines @@
       '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_types.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 1329 matching lines @@
                   '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
                 ],
               }
             ],
           ],
         },
       ],
     }],
   ],
 }