| 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 2087 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2098 ] | 2098 ] |
| 2099 } | 2099 } |
| 2100 | 2100 |
| 2101 if (use_ash) { | 2101 if (use_ash) { |
| 2102 sources += [ | 2102 sources += [ |
| 2103 "../browser/ui/ash/accelerator_commands_browsertest.cc", | 2103 "../browser/ui/ash/accelerator_commands_browsertest.cc", |
| 2104 "../browser/ui/ash/accelerator_controller_browsertest.cc", | 2104 "../browser/ui/ash/accelerator_controller_browsertest.cc", |
| 2105 "../browser/ui/ash/app_list/app_list_controller_ash_browsertest.cc", | 2105 "../browser/ui/ash/app_list/app_list_controller_ash_browsertest.cc", |
| 2106 "../browser/ui/ash/chrome_new_window_client_browsertest.cc", | 2106 "../browser/ui/ash/chrome_new_window_client_browsertest.cc", |
| 2107 "../browser/ui/ash/keyboard_controller_browsertest.cc", | 2107 "../browser/ui/ash/keyboard_controller_browsertest.cc", |
| 2108 "../browser/ui/ash/keyboard_end_to_end_browsertest.cc", |
| 2108 "../browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.
cc", | 2109 "../browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.
cc", |
| 2109 "../browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc", | 2110 "../browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc", |
| 2110 "../browser/ui/ash/multi_user/multi_user_window_manager_test.cc", | 2111 "../browser/ui/ash/multi_user/multi_user_window_manager_test.cc", |
| 2111 "../browser/ui/ash/multi_user/multi_user_window_manager_test.h", | 2112 "../browser/ui/ash/multi_user/multi_user_window_manager_test.h", |
| 2112 "../browser/ui/ash/networking_config_delegate_chromeos_browsertest.cc", | 2113 "../browser/ui/ash/networking_config_delegate_chromeos_browsertest.cc", |
| 2113 "../browser/ui/ash/shelf_browsertest.cc", | 2114 "../browser/ui/ash/shelf_browsertest.cc", |
| 2114 "../browser/ui/ash/system_tray_client_browsertest.cc", | 2115 "../browser/ui/ash/system_tray_client_browsertest.cc", |
| 2115 "../browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc
", | 2116 "../browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc
", |
| 2116 "../browser/ui/ash/volume_controller_browsertest.cc", | 2117 "../browser/ui/ash/volume_controller_browsertest.cc", |
| 2117 "../browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest
.cc", | 2118 "../browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest
.cc", |
| 2118 ] | 2119 ] |
| 2119 deps += [ | 2120 deps += [ |
| 2120 "//ash/test:ash_with_aura_test_support", | 2121 "//ash/test:ash_with_aura_test_support", |
| 2121 "//ash/test:test_support_with_content", | 2122 "//ash/test:test_support_with_content", |
| 2123 "//ui/keyboard:test_support", |
| 2122 ] | 2124 ] |
| 2123 | 2125 |
| 2124 if (enable_app_list) { | 2126 if (enable_app_list) { |
| 2125 deps += [ ":test_support_applist_ash" ] | 2127 deps += [ ":test_support_applist_ash" ] |
| 2126 } | 2128 } |
| 2127 | 2129 |
| 2128 if (enable_media_router) { | 2130 if (enable_media_router) { |
| 2129 sources += [ "../browser/ui/ash/system_tray_tray_cast_browsertest_media_
router_chromeos.cc" ] | 2131 sources += [ "../browser/ui/ash/system_tray_tray_cast_browsertest_media_
router_chromeos.cc" ] |
| 2130 } | 2132 } |
| 2131 } | 2133 } |
| (...skipping 3068 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5200 } | 5202 } |
| 5201 | 5203 |
| 5202 if (is_win) { | 5204 if (is_win) { |
| 5203 loadable_module("conflicts_dll") { | 5205 loadable_module("conflicts_dll") { |
| 5204 testonly = true | 5206 testonly = true |
| 5205 sources = [ | 5207 sources = [ |
| 5206 "conflicts/conflicts_dll.cc", | 5208 "conflicts/conflicts_dll.cc", |
| 5207 ] | 5209 ] |
| 5208 } | 5210 } |
| 5209 } | 5211 } |
| OLD | NEW |