Move DisplayManager and DisplayChangeObserverX11 from aura to ash.

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 57 matching lines @@
         'desktop_background/desktop_background_controller.cc',
         'desktop_background/desktop_background_controller.h',
         'desktop_background/desktop_background_controller_observer.h',
         'desktop_background/desktop_background_resources.cc',
         'desktop_background/desktop_background_resources.h',
         'desktop_background/desktop_background_view.cc',
         'desktop_background/desktop_background_view.h',
         'desktop_background/desktop_background_widget_controller.cc',
         'desktop_background/desktop_background_widget_controller.h',
         'desktop_background/user_wallpaper_delegate.h',
+        'display/display_change_observer_x11.cc',
+        'display/display_change_observer_x11.h',
         'display/display_controller.cc',
         'display/display_controller.h',
         'display/display_error_dialog.cc',
         'display/display_error_dialog.h',
+        'display/display_manager.cc',
+        'display/display_manager.h',
         'display/mouse_cursor_event_filter.cc',
         'display/mouse_cursor_event_filter.h',
-        'display/multi_display_manager.cc',
-        'display/multi_display_manager.h',
         'display/output_configurator_animation.cc',
         'display/output_configurator_animation.h',
         'display/screen_position_controller.cc',
         'display/screen_position_controller.h',
         'display/shared_display_edge_indicator.cc',
         'display/shared_display_edge_indicator.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 357 matching lines @@
       'type': 'static_library',
       'dependencies': [
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
         'ash',
         'ash_resources',
       ],
       'sources': [
         'test/ash_test_base.cc',
         'test/ash_test_base.h',
-        'test/ash_unittests.cc',
         'test/capture_tracking_view.cc',
         'test/capture_tracking_view.h',
         'test/cursor_manager_test_api.cc',
         'test/cursor_manager_test_api.h',
         'test/launcher_view_test_api.cc',
         'test/launcher_view_test_api.h',
-        'test/multi_display_manager_test_api.cc',
-        'test/multi_display_manager_test_api.h',
+        'test/display_manager_test_api.cc',
+        'test/display_manager_test_api.h',
         'test/test_activation_delegate.cc',
         'test/test_activation_delegate.h',
         'test/test_launcher_delegate.cc',
         'test/test_launcher_delegate.h',
         'test/test_shell_delegate.cc',
         'test/test_shell_delegate.h',
         'test/test_suite.cc',
         'test/test_suite.h',
         'test/test_suite_init.h',
         'test/test_suite_init.mm',
@@ skipping 34 matching lines @@
         '../ui/views/test/test_views_delegate.cc',
         '../ui/views/test/test_views_delegate.h',
         'accelerators/accelerator_controller_unittest.cc',
         'accelerators/accelerator_filter_unittest.cc',
         'accelerators/accelerator_table_unittest.cc',
         'accelerators/nested_dispatcher_controller_unittest.cc',
         'desktop_background/desktop_background_controller_unittest.cc',
         'dip_unittest.cc',
         'display/display_controller_unittest.cc',
         'display/mouse_cursor_event_filter_unittest.cc',
-        'display/multi_display_manager_unittest.cc',
+        'display/display_manager_unittest.cc',
         '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',
         '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',
@@ skipping 10 matching lines @@
         'shell/panel_window.cc',
         'shell/shell_delegate_impl.cc',
         'shell/shell_delegate_impl.h',
         'shell/toplevel_window.cc',
         'shell/widgets.cc',
         'shell/window_type_launcher.cc',
         'shell/window_watcher.cc',
         'shell/window_watcher_unittest.cc',
         'system/tray/system_tray_unittest.cc',
         'system/web_notification/web_notification_tray_unittest.cc',
+        'test/ash_unittests.cc',
         'tooltips/tooltip_controller_unittest.cc',
         'wm/activation_controller_unittest.cc',
         'wm/base_layout_manager_unittest.cc',
         'wm/cursor_manager_unittest.cc',
         'wm/custom_frame_view_ash_unittest.cc',
         'wm/frame_painter_unittest.cc',
         'wm/image_grid_unittest.cc',
         'wm/panel_layout_manager_unittest.cc',
         'wm/power_button_controller_unittest.cc',
         'wm/screen_dimmer_unittest.cc',
@@ skipping 140 matching lines @@
             'shell/cocoa/app-Info.plist',
           ],
           'xcode_settings': {
             'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
           },
         }],
       ],
     },
   ],
 }