| 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 import("//testing/test.gni") | 7 import("//testing/test.gni") |
| 8 import("//ui/base/ui_features.gni") | 8 import("//ui/base/ui_features.gni") |
| 9 | 9 |
| 10 assert(use_aura) | 10 assert(use_aura) |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 "wm/stylus_metrics_recorder.h", | 145 "wm/stylus_metrics_recorder.h", |
| 146 ] | 146 ] |
| 147 } | 147 } |
| 148 | 148 |
| 149 if (!use_ozone) { | 149 if (!use_ozone) { |
| 150 sources -= [ | 150 sources -= [ |
| 151 "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.cc", | 151 "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.cc", |
| 152 "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h", | 152 "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h", |
| 153 ] | 153 ] |
| 154 } | 154 } |
| 155 |
| 156 # Usage of content should be in ash_content_unittests. |
| 157 assert_no_deps = [ "//content/*" ] |
| 155 } | 158 } |
| 156 | 159 |
| 157 component("ash_with_content") { | 160 component("ash_with_content") { |
| 158 sources = gypi_values.ash_with_content_sources | 161 sources = gypi_values.ash_with_content_sources |
| 159 | 162 |
| 160 defines = [ "ASH_WITH_CONTENT_IMPLEMENTATION" ] | 163 defines = [ "ASH_WITH_CONTENT_IMPLEMENTATION" ] |
| 161 | 164 |
| 162 public_deps = [ | 165 public_deps = [ |
| 163 ":ash", | 166 ":ash", |
| 164 ] | 167 ] |
| (...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 400 "//ui/message_center", | 403 "//ui/message_center", |
| 401 "//ui/message_center:test_support", | 404 "//ui/message_center:test_support", |
| 402 "//ui/views", | 405 "//ui/views", |
| 403 "//ui/views:test_support", | 406 "//ui/views:test_support", |
| 404 "//ui/views/controls/webview:test_support", | 407 "//ui/views/controls/webview:test_support", |
| 405 "//ui/web_dialogs:test_support", | 408 "//ui/web_dialogs:test_support", |
| 406 ] | 409 ] |
| 407 | 410 |
| 408 data_deps = [ | 411 data_deps = [ |
| 409 "//ash/common/strings:ash_test_strings", | 412 "//ash/common/strings:ash_test_strings", |
| 410 "//ash/resources:ash_test_resources_100_percent", | 413 "//ash/resources:ash_test_resources_with_content_100_percent", |
| 411 "//ash/resources:ash_test_resources_200_percent", | 414 "//ash/resources:ash_test_resources_200_percent", |
| 412 ] | 415 ] |
| 413 | 416 |
| 414 if (is_chromeos) { | 417 if (is_chromeos) { |
| 415 deps += [ | 418 deps += [ |
| 416 "//chromeos", | 419 "//chromeos", |
| 417 "//chromeos:power_manager_proto", | 420 "//chromeos:power_manager_proto", |
| 418 "//chromeos:test_support_without_gmock", | 421 "//chromeos:test_support_without_gmock", |
| 419 "//components/quirks", | 422 "//components/quirks", |
| 420 "//device/bluetooth", | 423 "//device/bluetooth", |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 530 # Maximize mode is only available on Chrome OS. | 533 # Maximize mode is only available on Chrome OS. |
| 531 "wm/maximize_mode/maximize_mode_controller_unittest.cc", | 534 "wm/maximize_mode/maximize_mode_controller_unittest.cc", |
| 532 "wm/maximize_mode/maximize_mode_window_manager_unittest.cc", | 535 "wm/maximize_mode/maximize_mode_window_manager_unittest.cc", |
| 533 "wm/workspace/workspace_window_resizer_unittest.cc", | 536 "wm/workspace/workspace_window_resizer_unittest.cc", |
| 534 ] | 537 ] |
| 535 } | 538 } |
| 536 | 539 |
| 537 if (!use_x11 || !is_chromeos) { | 540 if (!use_x11 || !is_chromeos) { |
| 538 sources -= [ "touch/touch_transformer_controller_unittest.cc" ] | 541 sources -= [ "touch/touch_transformer_controller_unittest.cc" ] |
| 539 } | 542 } |
| 543 |
| 544 # Usage of content should be in ash_with_content. |
| 545 assert_no_deps = [ "//content/*" ] |
| 540 } | 546 } |
| 541 | 547 |
| 542 executable("ash_shell_with_content") { | 548 executable("ash_shell_with_content") { |
| 543 testonly = true | 549 testonly = true |
| 544 sources = [ | 550 sources = [ |
| 545 "shell/content/shell_with_content_main.cc", | 551 "shell/content/shell_with_content_main.cc", |
| 546 ] | 552 ] |
| 547 | 553 |
| 548 deps = [ | 554 deps = [ |
| 549 ":ash_shell_lib_with_content", | 555 ":ash_shell_lib_with_content", |
| 550 "//base", | 556 "//base", |
| 551 "//build/config/sanitizers:deps", | 557 "//build/config/sanitizers:deps", |
| 552 "//build/win:default_exe_manifest", | 558 "//build/win:default_exe_manifest", |
| 553 "//components/user_manager", | 559 "//components/user_manager", |
| 554 "//content", | 560 "//content", |
| 555 "//content/public/app:both", | 561 "//content/public/app:both", |
| 556 ] | 562 ] |
| 557 | 563 |
| 558 data_deps = [ | 564 data_deps = [ |
| 559 "//ash/common/strings:ash_test_strings", | 565 "//ash/common/strings:ash_test_strings", |
| 560 "//ash/resources:ash_test_resources_100_percent", | 566 "//ash/resources:ash_test_resources_with_content_100_percent", |
| 561 "//ash/resources:ash_test_resources_200_percent", | 567 "//ash/resources:ash_test_resources_200_percent", |
| 562 ] | 568 ] |
| 563 | 569 |
| 564 if (is_win) { | 570 if (is_win) { |
| 565 configs -= [ "//build/config/win:console" ] | 571 configs -= [ "//build/config/win:console" ] |
| 566 configs += [ "//build/config/win:windowed" ] | 572 configs += [ "//build/config/win:windowed" ] |
| 567 deps += [ "//sandbox" ] | 573 deps += [ "//sandbox" ] |
| 568 } | 574 } |
| 569 | 575 |
| 570 if (is_chromeos) { | 576 if (is_chromeos) { |
| 571 deps += [ "//device/bluetooth" ] | 577 deps += [ "//device/bluetooth" ] |
| 572 } | 578 } |
| 573 } | 579 } |
| 574 # When adding support for isolates, please have a look at run-time dependencies | 580 # When adding support for isolates, please have a look at run-time dependencies |
| 575 # in the ash_unittests_run target in ash.gyp. | 581 # in the ash_unittests_run target in ash.gyp. |
| OLD | NEW |