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

ui/display/display.gyp

Index: ui/display/display.gyp
diff --git a/ui/display/display.gyp b/ui/display/display.gyp
index ecbbe3c7a37330bfbe62c59bd4c9b27dbadf682b..f07c73ee72d55c5719212122bd65fc17a585c4f2 100644
--- a/ui/display/display.gyp
+++ b/ui/display/display.gyp
@@ -46,6 +46,7 @@
       ],
       'sources': [
         # Note: file list duplicated in GN build.
+	'android/screen_android.cc',

[scottmg, 2016/05/10 21:34:37]

indent

[oshima, 2016/05/10 22:36:11]

forgot to respond. This looks fine. Am I missing something?

[scottmg, 2016/05/10 22:42:19]

It looks like it's two spaces too far to the right to me. Same with
ios/screen_ios.mm, and mac/screen_mac.mm below.

[scottmg, 2016/05/10 22:43:19]

Oh, it's actually that they're tabs. I don't know what happened to the red > we
used to have. :(

[oshima, 2016/05/10 22:51:53]

Oh, they were indeed tabs. Thank you for catching them.

         'chromeos/apply_content_protection_task.cc',
         'chromeos/apply_content_protection_task.h',
         'chromeos/configure_displays_task.cc',
@@ -72,17 +73,24 @@
         'chromeos/x11/native_display_event_dispatcher_x11.cc',
         'chromeos/x11/native_display_event_dispatcher_x11.h',
         'display.h',
+        'display_change_notifier.cc',
+        'display_change_notifier.h',
         'display_export.h',
         'display_finder.cc',
         'display_finder.h',
+        'display_observer.cc',
         'display_observer.h',
         'display_switches.cc',
         'display_switches.h',
+	'ios/screen_ios.mm',
+	'mac/screen_mac.mm',
         'manager/display_layout.cc',
         'manager/display_layout.h',
         'manager/display_layout_builder.cc',
         'manager/display_layout_builder.h',
+        'screen.cc',
         'screen.h',
+        'screen_aura.cc',
         'win/display_info.cc',
         'win/display_info.h',
         'win/dpi.cc',
@@ -112,6 +120,11 @@
             '../gfx/x/gfx_x11.gyp:gfx_x11',
           ],
         }],
+        ['OS=="android" and use_aura==1', {
+          'sources!': [
+            'android/screen_android.cc',
+          ],
+        }],
       ],
     },
     {
@@ -195,7 +208,6 @@
         'chromeos/test/test_display_layout_manager.h',
         'chromeos/test/test_native_display_delegate.cc',
         'chromeos/test/test_native_display_delegate.h',
-        'test/display_util.h',
         'test/test_screen.cc',
         'test/test_screen.h',
       ],
@@ -223,8 +235,11 @@
         'chromeos/update_display_configuration_task_unittest.cc',
         'chromeos/x11/display_util_x11_unittest.cc',
         'chromeos/x11/native_display_event_dispatcher_x11_unittest.cc',
+        'display_change_notifier_unittest.cc',
+        'display_unittest.cc',
         'manager/display_layout_builder_unittest.cc',
         'manager/display_layout_unittest.cc',
+        'screen_unittest.cc',
         'util/display_util_unittest.cc',
         'util/edid_parser_unittest.cc',
         'win/screen_win_unittest.cc',
@@ -238,6 +253,11 @@
             'display_types',
           ],
         }],
+        ['use_aura==1', {
+          'sources!': [
+            'screen_unittest.cc',

[scottmg, 2016/05/10 21:34:37]

same question

+          ],
+        }],
       ],
     },
   ],