Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(314)

Side by Side Diff: chrome/test/BUILD.gn

Issue 1866403006: Revert of AppListController refactoring part 3: Switching over to use AppListShower in Ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mus_chrome_delegates_ash_impl
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/chrome_build.gni") 5 import("//build/config/chrome_build.gni")
6 import("//build/config/compiler/compiler.gni") 6 import("//build/config/compiler/compiler.gni")
7 import("//build/config/crypto.gni") 7 import("//build/config/crypto.gni")
8 import("//build/config/features.gni") 8 import("//build/config/features.gni")
9 import("//build/config/ui.gni") 9 import("//build/config/ui.gni")
10 import("//chrome/chrome_tests.gni") 10 import("//chrome/chrome_tests.gni")
(...skipping 569 matching lines...) Expand 10 before | Expand all | Expand 10 after
580 ] 580 ]
581 } 581 }
582 } # enable_notifications 582 } # enable_notifications
583 583
584 if (!use_aura || is_chromeos) { 584 if (!use_aura || is_chromeos) {
585 sources -= 585 sources -=
586 [ "../../ui/views/corewm/desktop_capture_controller_unittest.cc" ] 586 [ "../../ui/views/corewm/desktop_capture_controller_unittest.cc" ]
587 } 587 }
588 } 588 }
589 589
590 if (enable_app_list && use_ash) {
591 source_set("test_support_applist_ash") {
592 defines = []
593 testonly = true
594
595 sources = rebase_path(
596 chrome_tests_gypi_values.chrome_browser_app_list_ash_test_support_ sources,
597 ".",
598 "//chrome")
599
600 deps = [
601 "//chrome/browser/ui",
602 "//ui/app_list/shower:test_support",
603 ]
604 }
605 }
606
607 source_set("sync_integration_test_support") { 590 source_set("sync_integration_test_support") {
608 testonly = true 591 testonly = true
609 sources = rebase_path( 592 sources = rebase_path(
610 chrome_tests_gypi_values.test_support_sync_integration_sources, 593 chrome_tests_gypi_values.test_support_sync_integration_sources,
611 ".", 594 ".",
612 "//chrome") 595 "//chrome")
613 public_deps = [ 596 public_deps = [
614 "//chrome/browser", 597 "//chrome/browser",
615 ] 598 ]
616 deps = [ 599 deps = [
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
1028 } 1011 }
1029 if (debug_devtools) { 1012 if (debug_devtools) {
1030 defines += [ "DEBUG_DEVTOOLS=1" ] 1013 defines += [ "DEBUG_DEVTOOLS=1" ]
1031 } 1014 }
1032 if (use_ash) { 1015 if (use_ash) {
1033 sources += 1016 sources +=
1034 rebase_path(chrome_tests_gypi_values.chrome_browser_tests_ash_sources, 1017 rebase_path(chrome_tests_gypi_values.chrome_browser_tests_ash_sources,
1035 ".", 1018 ".",
1036 "//chrome") 1019 "//chrome")
1037 deps += [ "//ash:test_support" ] 1020 deps += [ "//ash:test_support" ]
1038
1039 if (enable_app_list) {
1040 deps += [ ":test_support_applist_ash" ]
1041 }
1042 } 1021 }
1043 if (use_aura || toolkit_views) { 1022 if (use_aura || toolkit_views) {
1044 deps += [ "//ui/events:test_support" ] 1023 deps += [ "//ui/events:test_support" ]
1045 } 1024 }
1046 if (toolkit_views) { 1025 if (toolkit_views) {
1047 sources += rebase_path( 1026 sources += rebase_path(
1048 chrome_tests_gypi_values.chrome_browser_tests_views_sources, 1027 chrome_tests_gypi_values.chrome_browser_tests_views_sources,
1049 ".", 1028 ".",
1050 "//chrome") 1029 "//chrome")
1051 deps += [ "//ui/views" ] 1030 deps += [ "//ui/views" ]
(...skipping 1230 matching lines...) Expand 10 before | Expand all | Expand 10 after
2282 if (is_android) { 2261 if (is_android) {
2283 android_library("unit_tests_java") { 2262 android_library("unit_tests_java") {
2284 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap k/ChromeNativeTestApplication.java" ] 2263 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap k/ChromeNativeTestApplication.java" ]
2285 deps = [ 2264 deps = [
2286 "//base:base_java", 2265 "//base:base_java",
2287 "//chrome/android:chrome_java", 2266 "//chrome/android:chrome_java",
2288 "//content/public/android:content_java", 2267 "//content/public/android:content_java",
2289 ] 2268 ]
2290 } 2269 }
2291 } 2270 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698