Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//build/config/ui.gni") | 5 import("//build/config/ui.gni") |
| 6 import("//testing/test.gni") | 6 import("//testing/test.gni") |
| 7 | 7 |
| 8 component("display") { | 8 component("display") { |
| 9 sources = [ | 9 sources = [ |
| 10 "display.cc", | 10 "display.cc", |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 23 "display_observer.cc", | 23 "display_observer.cc", |
| 24 "display_observer.h", | 24 "display_observer.h", |
| 25 "display_switches.cc", | 25 "display_switches.cc", |
| 26 "display_switches.h", | 26 "display_switches.h", |
| 27 "fake_display_delegate.cc", | 27 "fake_display_delegate.cc", |
| 28 "fake_display_delegate.h", | 28 "fake_display_delegate.h", |
| 29 "fake_display_snapshot.cc", | 29 "fake_display_snapshot.cc", |
| 30 "fake_display_snapshot.h", | 30 "fake_display_snapshot.h", |
| 31 "ios/screen_ios.mm", | 31 "ios/screen_ios.mm", |
| 32 "mac/screen_mac.mm", | 32 "mac/screen_mac.mm", |
| 33 "mojo/display_mode_mojo.cc", | |
|
kylechar
2017/01/24 21:15:07
Move the files to ui/display/ instead.
thanhph1
2017/01/25 16:26:16
Done, thanks!
| |
| 34 "mojo/display_mode_mojo.h", | |
| 33 "screen.cc", | 35 "screen.cc", |
| 34 "screen.h", | 36 "screen.h", |
| 35 "screen_aura.cc", | 37 "screen_aura.cc", |
| 36 "screen_base.cc", | 38 "screen_base.cc", |
| 37 "screen_base.h", | 39 "screen_base.h", |
| 38 "win/display_info.cc", | 40 "win/display_info.cc", |
| 39 "win/display_info.h", | 41 "win/display_info.h", |
| 40 "win/dpi.cc", | 42 "win/dpi.cc", |
| 41 "win/dpi.h", | 43 "win/dpi.h", |
| 42 "win/scaling_util.cc", | 44 "win/scaling_util.cc", |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 140 "manager/chromeos/apply_content_protection_task_unittest.cc", | 142 "manager/chromeos/apply_content_protection_task_unittest.cc", |
| 141 "manager/chromeos/configure_displays_task_unittest.cc", | 143 "manager/chromeos/configure_displays_task_unittest.cc", |
| 142 "manager/chromeos/display_change_observer_unittest.cc", | 144 "manager/chromeos/display_change_observer_unittest.cc", |
| 143 "manager/chromeos/display_configurator_unittest.cc", | 145 "manager/chromeos/display_configurator_unittest.cc", |
| 144 "manager/chromeos/query_content_protection_task_unittest.cc", | 146 "manager/chromeos/query_content_protection_task_unittest.cc", |
| 145 "manager/chromeos/touch_transform_controller_unittest.cc", | 147 "manager/chromeos/touch_transform_controller_unittest.cc", |
| 146 "manager/chromeos/touchscreen_util_unittest.cc", | 148 "manager/chromeos/touchscreen_util_unittest.cc", |
| 147 "manager/chromeos/update_display_configuration_task_unittest.cc", | 149 "manager/chromeos/update_display_configuration_task_unittest.cc", |
| 148 "manager/display_manager_utilities_unittest.cc", | 150 "manager/display_manager_utilities_unittest.cc", |
| 149 "manager/managed_display_info_unittest.cc", | 151 "manager/managed_display_info_unittest.cc", |
| 152 "mojo/display_struct_traits_unittest.cc", | |
| 150 "screen_unittest.cc", | 153 "screen_unittest.cc", |
| 151 "util/display_util_unittest.cc", | 154 "util/display_util_unittest.cc", |
| 152 "util/edid_parser_unittest.cc", | 155 "util/edid_parser_unittest.cc", |
| 153 "win/scaling_util_unittest.cc", | 156 "win/scaling_util_unittest.cc", |
| 154 "win/screen_win_unittest.cc", | 157 "win/screen_win_unittest.cc", |
| 155 ] | 158 ] |
| 156 | 159 |
| 157 deps = [ | 160 deps = [ |
| 158 ":display", | 161 ":display", |
| 159 ":display_manager_test_api", | 162 ":display_manager_test_api", |
| 160 ":test_support", | 163 ":test_support", |
| 161 "//base", | 164 "//base", |
| 162 "//base/test:run_all_unittests", | 165 "//base/test:run_all_unittests", |
|
kylechar
2017/01/24 21:15:07
Remove this since you added another target with a
thanhph1
2017/01/25 16:26:16
Done, thanks!
| |
| 163 "//base/test:test_support", | 166 "//base/test:test_support", |
| 167 "//mojo/edk/test:run_all_unittests", | |
| 164 "//testing/gmock", | 168 "//testing/gmock", |
| 165 "//testing/gtest", | 169 "//testing/gtest", |
| 166 "//ui/display/manager", | 170 "//ui/display/manager", |
| 171 "//ui/display/mojo:interfaces", | |
|
kylechar
2017/01/24 21:15:07
Remove this, it's a public dep of test_interfaces.
thanhph1
2017/01/25 16:26:16
Done.
| |
| 172 "//ui/display/mojo:test_interfaces", | |
| 167 "//ui/display/types", | 173 "//ui/display/types", |
| 168 "//ui/display/util", | 174 "//ui/display/util", |
| 169 "//ui/events/devices", | 175 "//ui/events/devices", |
| 170 "//ui/gfx:test_support", | 176 "//ui/gfx:test_support", |
| 171 "//ui/gfx/geometry", | 177 "//ui/gfx/geometry", |
| 172 ] | 178 ] |
| 173 | 179 |
| 174 if (is_android) { | 180 if (is_android) { |
| 175 # Do not run display_change_notifier_unittest.cc on Android because it | 181 # Do not run display_change_notifier_unittest.cc on Android because it |
| 176 # does not compile display_observer.cc | 182 # does not compile display_observer.cc |
| 177 sources -= [ "display_change_notifier_unittest.cc" ] | 183 sources -= [ "display_change_notifier_unittest.cc" ] |
| 178 } | 184 } |
| 179 | 185 |
| 180 if (is_chromeos && use_x11) { | 186 if (is_chromeos && use_x11) { |
| 181 sources += [ | 187 sources += [ |
| 182 "manager/chromeos/x11/display_util_x11_unittest.cc", | 188 "manager/chromeos/x11/display_util_x11_unittest.cc", |
| 183 "manager/chromeos/x11/native_display_event_dispatcher_x11_unittest.cc", | 189 "manager/chromeos/x11/native_display_event_dispatcher_x11_unittest.cc", |
| 184 ] | 190 ] |
| 185 } | 191 } |
| 186 } | 192 } |
| OLD | NEW |