Move Screen, its impls, DisplayObserver and DisplayChangeNotifier to ui/display

ui/gfx/gfx.gyp

 # Copyright (c) 2013 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,
   },
   'targets': [
     {
@@ skipping 112 matching lines @@
       'include_dirs': [
         '<(DEPTH)/third_party/icu/source/common',
       ],
       'sources': [
         'android/device_display_info.cc',
         'android/device_display_info.h',
         'android/gfx_jni_registrar.cc',
         'android/gfx_jni_registrar.h',
         'android/java_bitmap.cc',
         'android/java_bitmap.h',
+        'android/screen_android.cc',
         'android/shared_device_display_info.cc',
         'android/shared_device_display_info.h',
         'android/view_configuration.cc',
         'android/view_configuration.h',
         'animation/animation.cc',
         'animation/animation.h',
         'animation/animation_container.cc',
         'animation/animation_container.h',
         'animation/animation_container_element.h',
         'animation/animation_container_observer.h',
@@ skipping 31 matching lines @@
         'color_analysis.h',
         'color_palette.h',
         'color_profile.cc',
         'color_profile.h',
         'color_profile_mac.mm',
         'color_profile_win.cc',
         'color_utils.cc',
         'color_utils.h',
         'display.cc',
         'display.h',
-        'display_change_notifier.cc',
-        'display_change_notifier.h',
-        'display_observer.cc',
-        'display_observer.h',
         'favicon_size.cc',
         'favicon_size.h',
         'font.cc',
         'font.h',
         'font_fallback.h',
         'font_fallback_linux.cc',
         'font_fallback_linux.h',
         'font_fallback_mac.mm',
         'font_fallback_win.cc',
         'font_fallback_win.h',
@@ skipping 84 matching lines @@
         'render_text_harfbuzz.cc',
         'render_text_harfbuzz.h',
         'render_text_mac.h',
         'render_text_mac.mm',
         'scoped_canvas.h',
         'scoped_cg_context_save_gstate_mac.h',
         'scoped_ns_graphics_context_save_gstate_mac.h',
         'scoped_ns_graphics_context_save_gstate_mac.mm',
         'scoped_ui_graphics_push_context_ios.h',
         'scoped_ui_graphics_push_context_ios.mm',
-        'screen.cc',
-        'screen.h',
-        'screen_android.cc',
-        'screen_aura.cc',
-        'screen_ios.mm',
-        'screen_mac.mm',
         'scrollbar_size.cc',
         'scrollbar_size.h',
         'selection_model.cc',
         'selection_model.h',
         'sequential_id_generator.cc',
         'sequential_id_generator.h',
         'shadow_value.cc',
         'shadow_value.h',
         'skbitmap_operations.cc',
         'skbitmap_operations.h',
@@ skipping 129 matching lines @@
           'sources!': [
             'nine_image_painter.cc',
             'nine_image_painter.h',
           ],
         }],
         ['OS=="android" and use_aura==0', {
           'sources!': [
             'path.cc',
           ],
         }],
-        ['OS=="android" and use_aura==1', {
-          'sources!': [
-            'screen_android.cc',
-          ],
-        }],
         ['OS=="android" or OS=="ios"', {
           'sources!': [
             'harfbuzz_font_skia.cc',
             'harfbuzz_font_skia.h',
             'render_text.cc',
             'render_text.h',
             'render_text_harfbuzz.cc',
             'render_text_harfbuzz.h',
             'text_utils_skia.cc',
           ],
@@ skipping 135 matching lines @@
          ],
          'variables': {
            'jni_gen_package': 'ui/gfx',
          },
          'includes': [ '../../build/jni_generator.gypi' ],
        },
      ],
     }],
   ],
 }