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

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

Issue 2576913002: Use mojo app list interfaces for mash and classic ash. (Closed)
Patch Set: Sync and rebase Created 3 years, 11 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/browser/ui/ash/chrome_shell_delegate.cc ('k') | ui/app_list/presenter/BUILD.gn » ('j') | 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/common/features.gni") 10 import("//chrome/common/features.gni")
(...skipping 649 matching lines...) Expand 10 before | Expand all | Expand 10 after
660 "../browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest .cc", 660 "../browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest .cc",
661 "../browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils. cc", 661 "../browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils. cc",
662 "../browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils. h", 662 "../browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils. h",
663 "../browser/notifications/login_state_notification_blocker_chromeos_brow sertest.cc", 663 "../browser/notifications/login_state_notification_blocker_chromeos_brow sertest.cc",
664 "data/chromeos/service_login.html", 664 "data/chromeos/service_login.html",
665 ] 665 ]
666 deps += [ 666 deps += [
667 "//ash/resources", 667 "//ash/resources",
668 "//chrome/browser/media/router:test_support", 668 "//chrome/browser/media/router:test_support",
669 "//chromeos", 669 "//chromeos",
670 "//mojo/edk/system",
671 "//ui/app_list/presenter:test_support",
670 ] 672 ]
671 673
672 data += [ 674 data += [
673 "//chrome/browser/chromeos/login/test/https_forwarder.py", 675 "//chrome/browser/chromeos/login/test/https_forwarder.py",
674 "//google_apis/test/", 676 "//google_apis/test/",
675 "$root_out_dir/resources/chromeos/", 677 "$root_out_dir/resources/chromeos/",
676 ] 678 ]
677 679
678 data_deps += [ "//ui/keyboard:resources" ] 680 data_deps += [ "//ui/keyboard:resources" ]
679 681
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
763 765
764 if (!use_aura) { 766 if (!use_aura) {
765 sources -= [ 767 sources -= [
766 "base/interactive_test_utils_aura.cc", 768 "base/interactive_test_utils_aura.cc",
767 "base/interactive_test_utils_aura.h", 769 "base/interactive_test_utils_aura.h",
768 ] 770 ]
769 } 771 }
770 772
771 if (use_ash) { 773 if (use_ash) {
772 sources += [ 774 sources += [
775 "../browser/ui/ash/app_list/app_list_interactive_uitest.cc",
773 "../browser/ui/views/ash/tab_scrubber_browsertest.cc", 776 "../browser/ui/views/ash/tab_scrubber_browsertest.cc",
774 "../browser/ui/window_sizer/window_sizer_ash_uitest.cc", 777 "../browser/ui/window_sizer/window_sizer_ash_uitest.cc",
775 "//ash/drag_drop/drag_drop_interactive_uitest.cc", 778 "//ash/drag_drop/drag_drop_interactive_uitest.cc",
776 "//ash/wm/ash_native_cursor_manager_interactive_uitest.cc", 779 "//ash/wm/ash_native_cursor_manager_interactive_uitest.cc",
777 ] 780 ]
778 sources -= [ 781 sources -= [
779 # Use only the _chromeos version on Ash / Chrome OS. 782 # Use only the _chromeos version on Ash / Chrome OS.
780 "base/view_event_test_platform_part_default.cc", 783 "base/view_event_test_platform_part_default.cc",
781 ] 784 ]
782 deps += [ "//ash/test:interactive_ui_test_support" ] 785 deps += [ "//ash/test:interactive_ui_test_support" ]
(...skipping 4318 matching lines...) Expand 10 before | Expand all | Expand 10 after
5101 } 5104 }
5102 5105
5103 if (is_win) { 5106 if (is_win) {
5104 loadable_module("conflicts_dll") { 5107 loadable_module("conflicts_dll") {
5105 testonly = true 5108 testonly = true
5106 sources = [ 5109 sources = [
5107 "conflicts/conflicts_dll.cc", 5110 "conflicts/conflicts_dll.cc",
5108 ] 5111 ]
5109 } 5112 }
5110 } 5113 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.cc ('k') | ui/app_list/presenter/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698