Chromium Code Reviews| 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/crypto.gni") | 5 import("//build/config/crypto.gni") |
| 6 import("//build/config/features.gni") | 6 import("//build/config/features.gni") |
| 7 import("//build/config/ui.gni") | 7 import("//build/config/ui.gni") |
| 8 import("//chrome/common/features.gni") | 8 import("//chrome/common/features.gni") |
| 9 | 9 |
| 10 gypi_values = exec_script("//build/gypi_to_gn.py", | 10 gypi_values = exec_script("//build/gypi_to_gn.py", |
| (...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 548 "//chrome") | 548 "//chrome") |
| 549 } | 549 } |
| 550 } | 550 } |
| 551 | 551 |
| 552 # In GYP this is part of test_support_common. | 552 # In GYP this is part of test_support_common. |
| 553 source_set("test_support") { | 553 source_set("test_support") { |
| 554 testonly = true | 554 testonly = true |
| 555 | 555 |
| 556 sources = [ | 556 sources = [ |
| 557 "browser.h", | 557 "browser.h", |
| 558 "cocoa/extensions/browser_action_test_util_mac.mm", | 558 "cocoa/cocoa_test_helper.h", |
| 559 "cocoa/find_bar/find_bar_host_unittest_util_cocoa.mm", | 559 "cocoa/cocoa_test_helper.mm", |
| 560 "cocoa/run_loop_testing.h", | 560 "cocoa/run_loop_testing.h", |
| 561 "cocoa/run_loop_testing.mm", | 561 "cocoa/run_loop_testing.mm", |
| 562 "exclusive_access/fullscreen_controller_state_test.cc", | 562 "exclusive_access/fullscreen_controller_state_test.cc", |
| 563 "exclusive_access/fullscreen_controller_state_test.h", | 563 "exclusive_access/fullscreen_controller_state_test.h", |
| 564 "exclusive_access/fullscreen_controller_state_tests.h", | 564 "exclusive_access/fullscreen_controller_state_tests.h", |
| 565 "exclusive_access/fullscreen_controller_test.cc", | 565 "exclusive_access/fullscreen_controller_test.cc", |
| 566 "exclusive_access/fullscreen_controller_test.h", | 566 "exclusive_access/fullscreen_controller_test.h", |
| 567 "find_bar/find_bar_host_unittest_util.h", | 567 "find_bar/find_bar_host_unittest_util.h", |
| 568 "login/login_prompt_test_utils.cc", | 568 "login/login_prompt_test_utils.cc", |
| 569 "login/login_prompt_test_utils.h", | 569 "login/login_prompt_test_utils.h", |
| (...skipping 24 matching lines...) Expand all Loading... | |
| 594 "exclusive_access/fullscreen_controller_state_test.cc", | 594 "exclusive_access/fullscreen_controller_state_test.cc", |
| 595 "exclusive_access/fullscreen_controller_state_test.h", | 595 "exclusive_access/fullscreen_controller_state_test.h", |
| 596 "exclusive_access/fullscreen_controller_state_tests.h", | 596 "exclusive_access/fullscreen_controller_state_tests.h", |
| 597 "exclusive_access/fullscreen_controller_test.cc", | 597 "exclusive_access/fullscreen_controller_test.cc", |
| 598 "exclusive_access/fullscreen_controller_test.h", | 598 "exclusive_access/fullscreen_controller_test.h", |
| 599 "test/test_confirm_bubble_model.cc", | 599 "test/test_confirm_bubble_model.cc", |
| 600 "test/test_confirm_bubble_model.h", | 600 "test/test_confirm_bubble_model.h", |
| 601 ] | 601 ] |
| 602 } | 602 } |
| 603 | 603 |
| 604 if (is_mac && !mac_views_browser) { | |
|
tapted
2015/12/17 01:49:19
can this just be an `else` clause of `if (toolkit_
jackhou1
2015/12/17 04:03:50
Done.
| |
| 605 sources += [ | |
| 606 "cocoa/extensions/browser_action_test_util_mac.mm", | |
| 607 "cocoa/find_bar/find_bar_host_unittest_util_cocoa.mm", | |
| 608 ] | |
| 609 } | |
| 610 | |
| 604 public_deps = [ | 611 public_deps = [ |
| 605 ":ui", | 612 ":ui", |
| 606 ] | 613 ] |
| 607 deps = [ | 614 deps = [ |
| 608 "//chrome/app/theme:theme_resources", | 615 "//chrome/app/theme:theme_resources", |
| 609 "//chrome/browser", | 616 "//chrome/browser", |
| 610 "//content/public/browser", | 617 "//content/public/browser", |
| 611 "//content/public/common", | 618 "//content/public/common", |
| 612 "//content/test:test_support", | 619 "//content/test:test_support", |
| 613 "//net:test_support", | 620 "//net:test_support", |
| 614 "//skia", | 621 "//skia", |
| 615 "//testing/gtest", | 622 "//testing/gtest", |
| 616 "//ui/base", | 623 "//ui/base", |
| 617 ] | 624 ] |
| 618 } | 625 } |
| OLD | NEW |