[Cleanup] Screen cleanup

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 109 matching lines @@
         'display/mirror_window_controller.cc',
         'display/mirror_window_controller.h',
         'display/mouse_cursor_event_filter.cc',
         'display/mouse_cursor_event_filter.h',
         'display/output_configurator_animation.cc',
         'display/output_configurator_animation.h',
         'display/resolution_notification_controller.cc',
         'display/resolution_notification_controller.h',
         'display/root_window_transformers.cc',
         'display/root_window_transformers.h',
+        'display/screen_ash.cc',
+        'display/screen_ash.h',
         'display/screen_position_controller.cc',
         'display/screen_position_controller.h',
         'display/shared_display_edge_indicator.cc',
         'display/shared_display_edge_indicator.h',
         'display/virtual_keyboard_window_controller.cc',
         'display/virtual_keyboard_window_controller.h',
         'drag_drop/drag_drop_controller.cc',
         'drag_drop/drag_drop_controller.h',
         'drag_drop/drag_drop_tracker.cc',
         'drag_drop/drag_drop_tracker.h',
@@ skipping 37 matching lines @@
         'popup_message.cc',
         'popup_message.h',
         'root_window_controller.cc',
         'root_window_controller.h',
         'root_window_settings.cc',
         'root_window_settings.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',
+        'screen_util.cc',
+        'screen_util.h',
         'screenshot_delegate.h',
         'session_state_delegate.h',
         'session_state_observer.cc',
         '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/app_list_shelf_item_delegate.cc',
         'shelf/app_list_shelf_item_delegate.h',
@@ skipping 631 matching lines @@
         'display/screen_position_controller_unittest.cc',
         'drag_drop/drag_drop_controller_unittest.cc',
         'drag_drop/drag_drop_tracker_unittest.cc',
         'extended_desktop_unittest.cc',
         'focus_cycler_unittest.cc',
         'ime/candidate_window_view_unittest.cc',
         'keyboard_overlay/keyboard_overlay_delegate_unittest.cc',
         'keyboard_overlay/keyboard_overlay_view_unittest.cc',
         'magnifier/magnification_controller_unittest.cc',
         'root_window_controller_unittest.cc',
-        'screen_ash_unittest.cc',
+        'screen_util_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_model_unittest.cc',
         'shelf/shelf_navigator_unittest.cc',
         'shelf/shelf_tooltip_manager_unittest.cc',
         'shelf/shelf_unittest.cc',
         'shelf/shelf_view_unittest.cc',
@@ skipping 210 matching lines @@
             },
           },
           'dependencies': [
             '../sandbox/sandbox.gyp:sandbox',
           ],
         }],
       ],
     },
   ],
 }