Rename the remaining usage of Monitor to Display

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',
   },
 
@@ skipping 79 matching lines @@
         'launcher/launcher_tooltip_manager.cc',
         'launcher/launcher_tooltip_manager.h',
         'launcher/launcher_types.cc',
         'launcher/launcher_types.h',
         'launcher/launcher_view.cc',
         'launcher/launcher_view.h',
         'launcher/tabbed_launcher_button.cc',
         'launcher/tabbed_launcher_button.h',
         'magnifier/magnification_controller.cc',
         'magnifier/magnification_controller.h',
-        'monitor/monitor_controller.cc',
-        'monitor/monitor_controller.h',
-        'monitor/mouse_cursor_event_filter.cc',
-        'monitor/mouse_cursor_event_filter.h',
-        'monitor/multi_monitor_manager.cc',
-        'monitor/multi_monitor_manager.h',
-        'monitor/secondary_monitor_view.cc',
-        'monitor/secondary_monitor_view.h',
+        'display/display_controller.cc',
+        'display/display_controller.h',
+        'display/mouse_cursor_event_filter.cc',
+        'display/mouse_cursor_event_filter.h',
+        'display/multi_display_manager.cc',
+        'display/multi_display_manager.h',
+        'display/secondary_display_view.cc',
+        'display/secondary_display_view.h',
         'root_window_controller.cc',
         'root_window_controller.h',
         'screen_ash.cc',
         'screen_ash.h',
         'screensaver/screensaver_view.cc',
         'screensaver/screensaver_view.h',
         'screenshot_delegate.h',
         'shell.cc',
         'shell.h',
         'shell_context_menu.cc',
@@ skipping 254 matching lines @@
         'ash',
       ],
       'sources': [
         '../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',
         'dip_unittest.cc',
+        'display/multi_display_manager_unittest.cc',
         'drag_drop/drag_drop_controller_unittest.cc',
         'extended_desktop_unittest.cc',
         'focus_cycler_unittest.cc',
         'launcher/launcher_context_menu_unittest.cc',
         'launcher/launcher_model_unittest.cc',
         'launcher/launcher_navigator_unittest.cc',
         'launcher/launcher_unittest.cc',
         'launcher/launcher_view_unittest.cc',
-        'monitor/multi_monitor_manager_unittest.cc',
         'root_window_controller_unittest.cc',
         'screensaver/screensaver_view_unittest.cc',
         'shell_unittest.cc',
         'system/tray/system_tray_unittest.cc',
         'system/web_notification/web_notification_tray_unittest.cc',
         'test/ash_test_base.cc',
         'test/ash_test_base.h',
         'test/ash_unittests.cc',
         'test/capture_tracking_view.cc',
         'test/capture_tracking_view.h',
@@ skipping 159 matching lines @@
             'shell/cocoa/app-Info.plist',
           ],
           'xcode_settings': {
             'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
           },
         }],
       ],
     },
   ],
 }