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

ui/gfx/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
@@ skipping 52 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 66 matching lines @@
     "platform_font_mac.h",
     "platform_font_mac.mm",
     "platform_font_win.cc",
     "platform_font_win.h",
     "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 126 matching lines @@
       "codec/jpeg_codec.cc",
       "codec/jpeg_codec.h",
     ]
   } else {
     deps += [ "//third_party:jpeg" ]
   }
 
   # Android.
   if (is_android) {
     if (use_aura) {
-      sources -= [
-        "canvas_notimplemented.cc",
-        "screen_android.cc",
-      ]
+      sources -= [ "canvas_notimplemented.cc" ]
       sources += [ "font_fallback_android.cc" ]
     } else {
       sources -= [
         "animation/throb_animation.cc",
         "canvas_skia.cc",
         "path.cc",
         "selection_model.cc",
       ]
     }
 
@@ skipping 57 matching lines @@
       "chromeos/codec/jpeg_codec_robust_slow.h",
     ]
     deps += [ "//third_party/libjpeg" ]
   }
 
   if (is_mac) {
     libs = [ "IOSurface.framework" ]
   }
 
   if (!use_aura) {
-    sources -= [ "screen_aura.cc" ]
     if (!toolkit_views) {
       sources -= [
         "nine_image_painter.cc",
         "nine_image_painter.h",
       ]
     }
   }
 
   if (use_x11) {
     deps += [ "//ui/gfx/x" ]
@@ skipping 278 matching lines @@
   sources = [
     "font_render_params_linux_unittest.cc",
     "font_unittest.cc",
     "image/image_family_unittest.cc",
     "image/image_ios_unittest.mm",
     "image/image_skia_unittest.cc",
     "image/image_unittest.cc",
     "ios/NSString+CrStringDrawing_unittest.mm",
     "ios/uikit_util_unittest.mm",
     "platform_font_linux_unittest.cc",
-    "screen_unittest.cc",
     "test/run_all_unittests.cc",
     "text_elider_unittest.cc",
     "text_utils_unittest.cc",
   ]
 
   data = [
     "test/data/",
     "$root_out_dir/ui_test.pak",
   ]
 
   if (!is_ios) {
     sources += [
       "animation/animation_container_unittest.cc",
       "animation/animation_unittest.cc",
       "animation/multi_animation_unittest.cc",
       "animation/slide_animation_unittest.cc",
       "animation/tween_unittest.cc",
       "blit_unittest.cc",
       "break_list_unittest.cc",
       "canvas_unittest.cc",
       "canvas_unittest_mac.mm",
       "codec/jpeg_codec_unittest.cc",
       "codec/png_codec_unittest.cc",
       "color_analysis_unittest.cc",
       "color_profile_mac_unittest.mm",
       "color_utils_unittest.cc",
-      "display_change_notifier_unittest.cc",
-      "display_unittest.cc",
       "font_fallback_mac_unittest.cc",
       "font_list_unittest.cc",
       "geometry/box_unittest.cc",
       "geometry/cubic_bezier_unittest.cc",
       "geometry/insets_unittest.cc",
       "geometry/matrix3_unittest.cc",
       "geometry/point3_unittest.cc",
       "geometry/point_unittest.cc",
       "geometry/quad_unittest.cc",
       "geometry/rect_unittest.cc",
@@ skipping 49 matching lines @@
 
   if (!is_mac && !is_ios) {
     sources += [
       "interpolated_transform_unittest.cc",
       "transform_unittest.cc",
     ]
   }
 
   if (is_android) {
     deps += [ "//ui/android:ui_java" ]
-
-    sources -= [
-      # Do not run display_change_notifier_unittest.cc on Android because it
-      # does not compile display_observer.cc
-      "display_change_notifier_unittest.cc",
-    ]
   }
 
-  if (use_aura) {
-    sources -= [ "screen_unittest.cc" ]
-  } else if (!is_ios) {
+  if (!use_aura && !is_ios) {
     sources -= [ "nine_image_painter_unittest.cc" ]
   }
 
   if (is_chromeos) {
     sources += [ "chromeos/codec/jpeg_codec_robust_slow_unittest.cc" ]
   }
 
   if (is_win) {
     sources += [
       "color_profile_win_unittest.cc",
@@ skipping 21 matching lines @@
 if (is_android) {
   generate_jni("gfx_jni_headers") {
     sources = [
       "../android/java/src/org/chromium/ui/gfx/BitmapHelper.java",
       "../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java",
       "../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java",
     ]
     jni_package = "gfx"
   }
 }