ash: Minor cleanup, move more files from launcher to 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,
     'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
   },
   'includes': [
@@ skipping 142 matching lines @@
         'launcher/launcher_navigator.cc',
         'launcher/launcher_navigator.h',
         'launcher/launcher_tooltip_manager.cc',
         'launcher/launcher_tooltip_manager.h',
         'launcher/launcher_types.cc',
         'launcher/launcher_types.h',
         'launcher/launcher_util.cc',
         'launcher/launcher_util.h',
         'launcher/launcher_view.cc',
         'launcher/launcher_view.h',
-        'launcher/overflow_bubble.cc',
-        'launcher/overflow_bubble.h',
-        'launcher/overflow_button.cc',
-        'launcher/overflow_button.h',
-        'launcher/scoped_observer_with_duplicated_sources.h',
         'magnifier/magnification_controller.cc',
         'magnifier/magnification_controller.h',
         'magnifier/magnifier_constants.h',
         'magnifier/partial_magnification_controller.cc',
         'magnifier/partial_magnification_controller.h',
         'popup_message.cc',
         'popup_message.h',
         'root_window_controller.cc',
         'root_window_controller.h',
         'rotator/screen_rotation.cc',
         'rotator/screen_rotation.h',
         'scoped_target_root_window.cc',
         'scoped_target_root_window.h',
         'screen_ash.cc',
         'screen_ash.h',
         'screensaver/screensaver_view.cc',
         'screensaver/screensaver_view.h',
         'screenshot_delegate.h',
         'session_state_delegate.h',
         'session_state_observer.h',
         'shelf/alternate_app_list_button.cc',
         'shelf/alternate_app_list_button.h',
         'shelf/app_list_button.cc',
         'shelf/app_list_button.h',
         'shelf/background_animator.cc',
         'shelf/background_animator.h',
+        'shelf/overflow_bubble.cc',
+        'shelf/overflow_bubble.h',
+        'shelf/overflow_button.cc',
+        'shelf/overflow_button.h',
+        'shelf/scoped_observer_with_duplicated_sources.h',
         'shelf/shelf_bezel_event_filter.cc',
         'shelf/shelf_bezel_event_filter.h',
         'shelf/shelf_layout_manager.cc',
         'shelf/shelf_layout_manager.h',
         'shelf/shelf_layout_manager_observer.h',
         'shelf/shelf_types.h',
         'shelf/shelf_widget.cc',
         'shelf/shelf_widget.h',
         'shell.cc',
         'shell.h',
@@ skipping 494 matching lines @@
         'drag_drop/drag_drop_tracker_unittest.cc',
         'extended_desktop_unittest.cc',
         'focus_cycler_unittest.cc',
         'keyboard_overlay/keyboard_overlay_delegate_unittest.cc',
         'keyboard_overlay/keyboard_overlay_view_unittest.cc',
         'launcher/launcher_model_unittest.cc',
         'launcher/launcher_navigator_unittest.cc',
         'launcher/launcher_tooltip_manager_unittest.cc',
         'launcher/launcher_unittest.cc',
         'launcher/launcher_view_unittest.cc',
-        'launcher/scoped_observer_with_duplicated_sources_unittest.cc',
         'magnifier/magnification_controller_unittest.cc',
         'root_window_controller_unittest.cc',
         'screen_ash_unittest.cc',
         'screensaver/screensaver_view_unittest.cc',
         'session_state_delegate_stub.cc',
         'session_state_delegate_stub.h',
+        'shelf/scoped_observer_with_duplicated_sources_unittest.cc',
         'shelf/shelf_layout_manager_unittest.cc',
         'shelf/shelf_widget_unittest.cc',
         'shell_unittest.cc',
         'shell/app_list.cc',
         'shell/bubble.cc',
         'shell/context_menu.cc',
         'shell/context_menu.h',
         'shell/launcher_delegate_impl.cc',
         'shell/lock_view.cc',
         'shell/panel_window.cc',
@@ skipping 204 matching lines @@
             'shell/cocoa/app-Info.plist',
           ],
           'xcode_settings': {
             'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
           },
         }],
       ],
     },
   ],
 }