mash: Convert ShelfView to wm common types, clean up Shelf access

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_aura.cc',
@@ skipping 123 matching lines @@
       'common/shelf/shelf_background_animator.cc',
       'common/shelf/shelf_background_animator.h',
       'common/shelf/shelf_background_animator_observer.h',
       'common/shelf/shelf_button.cc',
       'common/shelf/shelf_button.h',
       'common/shelf/shelf_button_pressed_metric_tracker.cc',
       'common/shelf/shelf_button_pressed_metric_tracker.h',
       'common/shelf/shelf_constants.cc',
       'common/shelf/shelf_constants.h',
       'common/shelf/shelf_delegate.h',
+      'common/shelf/shelf_icon_observer.h',
       'common/shelf/shelf_item_delegate.h',
       'common/shelf/shelf_item_types.cc',
       'common/shelf/shelf_item_types.h',
       'common/shelf/shelf_locking_manager.cc',
       'common/shelf/shelf_locking_manager.h',
       'common/shelf/shelf_menu_model.h',
       'common/shelf/shelf_model.cc',
       'common/shelf/shelf_model.h',
       'common/shelf/shelf_model_observer.h',
       'common/shelf/shelf_navigator.cc',
       'common/shelf/shelf_navigator.h',
       'common/shelf/shelf_tooltip_manager.cc',
       'common/shelf/shelf_tooltip_manager.h',
       'common/shelf/shelf_types.h',
+      'common/shelf/shelf_view.cc',
+      'common/shelf/shelf_view.h',
       'common/shelf/shelf_window_watcher.cc',
       'common/shelf/shelf_window_watcher.h',
       'common/shelf/shelf_window_watcher_item_delegate.cc',
       'common/shelf/shelf_window_watcher_item_delegate.h',
+      'common/shelf/wm_shelf.cc',
       '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_delegate.h',
       'common/shell_window_ids.cc',
       'common/shell_window_ids.h',
       'common/system/accessibility_observer.h',
       'common/system/audio/audio_observer.h',
       'common/system/audio/tray_audio.cc',
@@ skipping 467 matching lines @@
       'rotator/window_rotation.h',
       'screen_util.cc',
       'screen_util.h',
       'screenshot_delegate.h',
       'shelf/dimmer_view.cc',
       'shelf/dimmer_view.h',
       'shelf/shelf.cc',
       'shelf/shelf.h',
       'shelf/shelf_bezel_event_filter.cc',
       'shelf/shelf_bezel_event_filter.h',
-      'shelf/shelf_icon_observer.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_view.cc',
-      'shelf/shelf_view.h',
       'shelf/shelf_widget.cc',
       'shelf/shelf_widget.h',
       'shelf/shelf_window_targeter.cc',
       'shelf/shelf_window_targeter.h',
       'shell.cc',
       'shell.h',
       'shell_init_params.cc',
       'shell_init_params.h',
       'snap_to_pixel_layout_manager.cc',
       'snap_to_pixel_layout_manager.h',
@@ skipping 816 matching lines @@
                   '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
                 ],
               }
             ],
           ],
         },
       ],
     }],
   ],
 }