| 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/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 2007 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2018 # TODO(rockot) bug 505926: The chrome_extensions_browsertests target | 2018 # TODO(rockot) bug 505926: The chrome_extensions_browsertests target |
| 2019 # should be deleted and this line removed. See the | 2019 # should be deleted and this line removed. See the |
| 2020 # chrome_extensions_browsertests target for more. | 2020 # chrome_extensions_browsertests target for more. |
| 2021 "//extensions:chrome_extensions_browsertests", | 2021 "//extensions:chrome_extensions_browsertests", |
| 2022 "//extensions/common/api", | 2022 "//extensions/common/api", |
| 2023 ] | 2023 ] |
| 2024 } | 2024 } |
| 2025 | 2025 |
| 2026 if (use_ash) { | 2026 if (use_ash) { |
| 2027 sources += [ | 2027 sources += [ |
| 2028 "../browser/chromeos/input_method/textinput_test_helper.cc", |
| 2029 "../browser/chromeos/input_method/textinput_test_helper.h", |
| 2028 "../browser/ui/ash/accelerator_commands_browsertest.cc", | 2030 "../browser/ui/ash/accelerator_commands_browsertest.cc", |
| 2029 "../browser/ui/ash/accelerator_controller_browsertest.cc", | 2031 "../browser/ui/ash/accelerator_controller_browsertest.cc", |
| 2030 "../browser/ui/ash/app_list/app_list_controller_ash_browsertest.cc", | 2032 "../browser/ui/ash/app_list/app_list_controller_ash_browsertest.cc", |
| 2031 "../browser/ui/ash/chrome_new_window_client_browsertest.cc", | 2033 "../browser/ui/ash/chrome_new_window_client_browsertest.cc", |
| 2032 "../browser/ui/ash/keyboard_controller_browsertest.cc", | 2034 "../browser/ui/ash/keyboard_controller_browsertest.cc", |
| 2033 "../browser/ui/ash/keyboard_end_to_end_browsertest.cc", | 2035 "../browser/ui/ash/keyboard_end_to_end_browsertest.cc", |
| 2034 "../browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc", | 2036 "../browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc", |
| 2035 "../browser/ui/ash/multi_user/multi_user_window_manager_test.cc", | 2037 "../browser/ui/ash/multi_user/multi_user_window_manager_test.cc", |
| 2036 "../browser/ui/ash/multi_user/multi_user_window_manager_test.h", | 2038 "../browser/ui/ash/multi_user/multi_user_window_manager_test.h", |
| 2037 "../browser/ui/ash/networking_config_delegate_chromeos_browsertest.cc", | 2039 "../browser/ui/ash/networking_config_delegate_chromeos_browsertest.cc", |
| (...skipping 3191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5229 } | 5231 } |
| 5230 | 5232 |
| 5231 if (is_win) { | 5233 if (is_win) { |
| 5232 loadable_module("conflicts_dll") { | 5234 loadable_module("conflicts_dll") { |
| 5233 testonly = true | 5235 testonly = true |
| 5234 sources = [ | 5236 sources = [ |
| 5235 "conflicts/conflicts_dll.cc", | 5237 "conflicts/conflicts_dll.cc", |
| 5236 ] | 5238 ] |
| 5237 } | 5239 } |
| 5238 } | 5240 } |
| OLD | NEW |