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/features.gni") | 5 import("//build/config/features.gni") |
6 import("//build/config/ui.gni") | 6 import("//build/config/ui.gni") |
7 | 7 |
8 gypi_values = exec_script( | 8 gypi_values = exec_script( |
9 "//build/gypi_to_gn.py", | 9 "//build/gypi_to_gn.py", |
10 [ rebase_path("ash.gyp") ], | 10 [ rebase_path("ash.gyp") ], |
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
222 "//ui/compositor", | 222 "//ui/compositor", |
223 "//ui/events", | 223 "//ui/events", |
224 "//ui/events:events_base", | 224 "//ui/events:events_base", |
225 "//ui/gfx", | 225 "//ui/gfx", |
226 "//ui/gfx/geometry", | 226 "//ui/gfx/geometry", |
227 "//ui/keyboard", | 227 "//ui/keyboard", |
228 "//ui/message_center", | 228 "//ui/message_center", |
229 "//ui/resources", | 229 "//ui/resources", |
230 "//ui/views", | 230 "//ui/views", |
231 "//ui/views:test_support", | 231 "//ui/views:test_support", |
232 #'../ui/views/examples/examples.gyp:views_examples_lib', TODO(GYP) | 232 "//ui/views/examples:views_examples_lib", |
233 #'../ui/views/examples/examples.gyp:views_examples_with_content_lib', TODO(
GYP) | 233 "//ui/views/examples:views_examples_with_content_lib", |
234 ] | 234 ] |
235 } | 235 } |
236 | 236 |
237 if (false) { # TODO(GYP) enable ash shell and unit tests when they link. | |
238 | |
239 test("ash_unittests") { | 237 test("ash_unittests") { |
240 sources = gypi_values.ash_unittests_sources | 238 sources = gypi_values.ash_unittests_sources |
241 | 239 |
242 deps = [ | 240 deps = [ |
243 ":ash", | 241 ":ash", |
244 ":ash_with_content", | 242 ":ash_with_content", |
245 ":test_support", | 243 ":test_support", |
246 "//ash/resources", | 244 "//ash/resources", |
247 "//ash/strings", | 245 "//ash/strings", |
248 "//base", | 246 "//base", |
(...skipping 18 matching lines...) Expand all Loading... |
267 "//ui/events:gesture_detection", | 265 "//ui/events:gesture_detection", |
268 "//ui/gfx", | 266 "//ui/gfx", |
269 "//ui/gfx/geometry", | 267 "//ui/gfx/geometry", |
270 "//ui/keyboard", | 268 "//ui/keyboard", |
271 "//ui/message_center", | 269 "//ui/message_center", |
272 "//ui/message_center:test_support", | 270 "//ui/message_center:test_support", |
273 "//ui/resources", | 271 "//ui/resources", |
274 "//ui/views", | 272 "//ui/views", |
275 "//ui/views:test_support", | 273 "//ui/views:test_support", |
276 "//ui/views/controls/webview:test_support", | 274 "//ui/views/controls/webview:test_support", |
277 "//ui/web_dialogs", | 275 "//ui/web_dialogs:test_support", |
278 "//ui/wm", | 276 "//ui/wm", |
279 "//url", | 277 "//url", |
280 ] | 278 ] |
281 | 279 |
282 if (!is_chromeos) { | 280 if (!is_chromeos) { |
283 sources -= [ | 281 sources -= [ |
284 # TODO(zork): fix this test to build on Windows. See: crosbug.com/26906 | 282 # TODO(zork): fix this test to build on Windows. See: crosbug.com/26906 |
285 "focus_cycler_unittest.cc", | 283 "focus_cycler_unittest.cc", |
286 # All tests for multiple displays: not supported on Windows Ash. | 284 # All tests for multiple displays: not supported on Windows Ash. |
287 "accelerators/nested_dispatcher_controller_unittest.cc", | |
288 "wm/drag_window_resizer_unittest.cc", | 285 "wm/drag_window_resizer_unittest.cc", |
289 # Can't resize on Windows Ash. http://crbug.com/165962 | 286 # Can't resize on Windows Ash. http://crbug.com/165962 |
290 "ash_root_window_transformer_unittest.cc", | |
291 "magnifier/magnification_controller_unittest.cc", | 287 "magnifier/magnification_controller_unittest.cc", |
292 "wm/workspace/workspace_window_resizer_unittest.cc", | 288 "wm/workspace/workspace_window_resizer_unittest.cc", |
293 "sticky_keys/sticky_keys_overlay_unittest.cc", | 289 "sticky_keys/sticky_keys_overlay_unittest.cc", |
294 "sticky_keys/sticky_keys_unittest.cc", | 290 "sticky_keys/sticky_keys_unittest.cc", |
295 "system/tray/media_security/multi_profile_media_tray_item_unittest.cc", | 291 "system/tray/media_security/multi_profile_media_tray_item_unittest.cc", |
296 "autoclick/autoclick_unittest.cc", | 292 "autoclick/autoclick_unittest.cc", |
297 ] | 293 ] |
298 sources += [ | 294 sources += [ |
299 #'<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', TODO
(GYP) | 295 #'<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', TODO
(GYP) |
300 ] | 296 ] |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
365 } | 361 } |
366 } | 362 } |
367 | 363 |
368 test("ash_shell_unittests") { | 364 test("ash_shell_unittests") { |
369 sources = [ | 365 sources = [ |
370 "shell/window_watcher_unittest.cc", | 366 "shell/window_watcher_unittest.cc", |
371 "test/ash_unittests.cc", | 367 "test/ash_unittests.cc", |
372 ] | 368 ] |
373 | 369 |
374 deps = [ | 370 deps = [ |
| 371 ":ash_shell_lib", |
| 372 ":test_support", |
375 "//base/test:test_support", | 373 "//base/test:test_support", |
376 "//components/user_manager", | 374 "//components/user_manager", |
377 "//content/test:test_support", | 375 "//content/test:test_support", |
378 "//skia", | 376 "//skia", |
379 "//testing/gtest", | 377 "//testing/gtest", |
380 "//ui/aaccessibility", | 378 "//ui/accessibility", |
381 ] | 379 ] |
382 | 380 |
383 if (is_chromeos) { | 381 if (is_chromeos) { |
384 deps += [ "//ui/display" ] | 382 deps += [ "//ui/display" ] |
385 } | 383 } |
386 } | 384 } |
387 | |
388 } # if false | |
OLD | NEW |