ash: Minor cleanup, move more files from launcher to shelf.

ash/ash.gyp

Index: ash/ash.gyp
diff --git a/ash/ash.gyp b/ash/ash.gyp
index bdd9fbc3c2832d8d00234cbedc99165394e54356..cc88ed2e738bc2011c08b6cd73f09fff0c46320e 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -160,11 +160,6 @@
         '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',
@@ -191,6 +186,11 @@
         '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',
@@ -705,13 +705,13 @@
         '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',