| 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 2099 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2110 ] | 2110 ] |
| 2111 } | 2111 } |
| 2112 | 2112 |
| 2113 if (use_ash) { | 2113 if (use_ash) { |
| 2114 sources += [ | 2114 sources += [ |
| 2115 "../browser/ui/ash/accelerator_commands_browsertest.cc", | 2115 "../browser/ui/ash/accelerator_commands_browsertest.cc", |
| 2116 "../browser/ui/ash/accelerator_controller_browsertest.cc", | 2116 "../browser/ui/ash/accelerator_controller_browsertest.cc", |
| 2117 "../browser/ui/ash/app_list/app_list_controller_ash_browsertest.cc", | 2117 "../browser/ui/ash/app_list/app_list_controller_ash_browsertest.cc", |
| 2118 "../browser/ui/ash/chrome_new_window_client_browsertest.cc", | 2118 "../browser/ui/ash/chrome_new_window_client_browsertest.cc", |
| 2119 "../browser/ui/ash/keyboard_controller_browsertest.cc", | 2119 "../browser/ui/ash/keyboard_controller_browsertest.cc", |
| 2120 "../browser/ui/ash/keyboard_end_to_end_browsertest.cc", |
| 2120 "../browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.
cc", | 2121 "../browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.
cc", |
| 2121 "../browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc", | 2122 "../browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc", |
| 2122 "../browser/ui/ash/multi_user/multi_user_window_manager_test.cc", | 2123 "../browser/ui/ash/multi_user/multi_user_window_manager_test.cc", |
| 2123 "../browser/ui/ash/multi_user/multi_user_window_manager_test.h", | 2124 "../browser/ui/ash/multi_user/multi_user_window_manager_test.h", |
| 2124 "../browser/ui/ash/networking_config_delegate_chromeos_browsertest.cc", | 2125 "../browser/ui/ash/networking_config_delegate_chromeos_browsertest.cc", |
| 2125 "../browser/ui/ash/shelf_browsertest.cc", | 2126 "../browser/ui/ash/shelf_browsertest.cc", |
| 2126 "../browser/ui/ash/system_tray_client_browsertest.cc", | 2127 "../browser/ui/ash/system_tray_client_browsertest.cc", |
| 2127 "../browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc
", | 2128 "../browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc
", |
| 2128 "../browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chrome
os.cc", | 2129 "../browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chrome
os.cc", |
| 2129 "../browser/ui/ash/volume_controller_browsertest.cc", | 2130 "../browser/ui/ash/volume_controller_browsertest.cc", |
| (...skipping 3056 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5186 } | 5187 } |
| 5187 | 5188 |
| 5188 if (is_win) { | 5189 if (is_win) { |
| 5189 loadable_module("conflicts_dll") { | 5190 loadable_module("conflicts_dll") { |
| 5190 testonly = true | 5191 testonly = true |
| 5191 sources = [ | 5192 sources = [ |
| 5192 "conflicts/conflicts_dll.cc", | 5193 "conflicts/conflicts_dll.cc", |
| 5193 ] | 5194 ] |
| 5194 } | 5195 } |
| 5195 } | 5196 } |
| OLD | NEW |