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

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

Issue 1747803003: MacViews: Implement Tab Dragging (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix tests and review issues. 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
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 487 matching lines...) Expand 10 before | Expand all | Expand 10 after
498 ldflags += [ "-Wl,-ObjC" ] 498 ldflags += [ "-Wl,-ObjC" ]
499 499
500 # The browser window can be views or Cocoa on Mac. Test accordingly. 500 # The browser window can be views or Cocoa on Mac. Test accordingly.
501 if (mac_views_browser) { 501 if (mac_views_browser) {
502 sources += rebase_path( 502 sources += rebase_path(
503 chrome_tests_gypi_values.chrome_interactive_ui_test_views_non_ma c_sources, 503 chrome_tests_gypi_values.chrome_interactive_ui_test_views_non_ma c_sources,
504 ".", 504 ".",
505 "//chrome") 505 "//chrome")
506 506
507 # Aura depended tests. 507 # Aura depended tests.
508 sources -= [ 508 sources -= [ "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc" ]
509 "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc",
510 "../browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc",
511 ]
512 } else { 509 } else {
513 sources += rebase_path( 510 sources += rebase_path(
514 chrome_tests_gypi_values.chrome_interactive_ui_test_cocoa_source s, 511 chrome_tests_gypi_values.chrome_interactive_ui_test_cocoa_source s,
515 ".", 512 ".",
516 "//chrome") 513 "//chrome")
517 } 514 }
518 } 515 }
519 516
520 if (cld_version == 2) { 517 if (cld_version == 2) {
521 # Interactive tests should use whatever CLD2 data access mode that the 518 # Interactive tests should use whatever CLD2 data access mode that the
(...skipping 1741 matching lines...) Expand 10 before | Expand all | Expand 10 after
2263 if (is_android) { 2260 if (is_android) {
2264 android_library("unit_tests_java") { 2261 android_library("unit_tests_java") {
2265 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap k/ChromeNativeTestApplication.java" ] 2262 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap k/ChromeNativeTestApplication.java" ]
2266 deps = [ 2263 deps = [
2267 "//base:base_java", 2264 "//base:base_java",
2268 "//chrome/android:chrome_java", 2265 "//chrome/android:chrome_java",
2269 "//content/public/android:content_java", 2266 "//content/public/android:content_java",
2270 ] 2267 ]
2271 } 2268 }
2272 } 2269 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698