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/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 2119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2130 deps += [ "//ui/events:test_support" ] | 2130 deps += [ "//ui/events:test_support" ] |
| 2131 } | 2131 } |
| 2132 if (toolkit_views) { | 2132 if (toolkit_views) { |
| 2133 sources += [ | 2133 sources += [ |
| 2134 "../browser/ui/global_error/global_error_service_browsertest.cc", | 2134 "../browser/ui/global_error/global_error_service_browsertest.cc", |
| 2135 "../browser/ui/views/frame/browser_non_client_frame_view_browsertest_win .cc", | 2135 "../browser/ui/views/frame/browser_non_client_frame_view_browsertest_win .cc", |
| 2136 "../browser/ui/views/frame/browser_window_property_manager_browsertest_w in.cc", | 2136 "../browser/ui/views/frame/browser_window_property_manager_browsertest_w in.cc", |
| 2137 "../browser/ui/views/select_file_dialog_extension_browsertest.cc", | 2137 "../browser/ui/views/select_file_dialog_extension_browsertest.cc", |
| 2138 ] | 2138 ] |
| 2139 deps += [ "//ui/views" ] | 2139 deps += [ "//ui/views" ] |
| 2140 if (!is_chromeos) { | |
| 2141 sources += | |
| 2142 [ "../browser/ui/views/external_protocol_dialog_browsertest.cc" ] | |
| 2143 } | |
| 2140 if (!is_chromeos && (!is_mac || mac_views_browser)) { | 2144 if (!is_chromeos && (!is_mac || mac_views_browser)) { |
| 2141 sources += [ | 2145 sources += [ "../browser/ui/views/profiles/profile_chooser_view_browsert est.cc" ] |
| 2142 "../browser/ui/views/external_protocol_dialog_browsertest.cc", | |
| 2143 "../browser/ui/views/profiles/profile_chooser_view_browsertest.cc", | |
| 2144 ] | |
| 2145 } | 2146 } |
| 2146 if (!is_mac || mac_views_browser) { | 2147 if (!is_mac || mac_views_browser) { |
| 2147 sources += [ | 2148 sources += [ |
| 2148 # TODO(tapted): Move these to chrome_browser_tests_views_sources when the | 2149 # TODO(tapted): Move these to chrome_browser_tests_views_sources when the |
| 2149 # the corresponding files are moved in chrome_browser_ui.gypi (i.e. ou t of | 2150 # the corresponding files are moved in chrome_browser_ui.gypi (i.e. ou t of |
| 2150 # chrome_browser_ui_views_non_mac_sources). http://crbug.com/404979. | 2151 # chrome_browser_ui_views_non_mac_sources). http://crbug.com/404979. |
| 2151 "../browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc" , | 2152 "../browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc" , |
| 2152 "../browser/ui/views/autofill/card_unmask_prompt_view_tester_views.cc" , | 2153 "../browser/ui/views/autofill/card_unmask_prompt_view_tester_views.cc" , |
| 2153 "../browser/ui/views/autofill/card_unmask_prompt_view_tester_views.h", | 2154 "../browser/ui/views/autofill/card_unmask_prompt_view_tester_views.h", |
| 2154 "../browser/ui/views/autofill/password_generation_popup_view_tester_vi ews.cc", | 2155 "../browser/ui/views/autofill/password_generation_popup_view_tester_vi ews.cc", |
| (...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2349 "../browser/extensions/api/vpn_provider/vpn_provider_apitest.cc", | 2350 "../browser/extensions/api/vpn_provider/vpn_provider_apitest.cc", |
| 2350 "../browser/ui/ash/launcher/arc_app_launcher_browsertest.cc", | 2351 "../browser/ui/ash/launcher/arc_app_launcher_browsertest.cc", |
| 2351 "../browser/ui/views/arc_app_dialog_view_browsertest.cc", | 2352 "../browser/ui/views/arc_app_dialog_view_browsertest.cc", |
| 2352 "../browser/ui/webui/options/chromeos/accounts_options_browsertest.cc", | 2353 "../browser/ui/webui/options/chromeos/accounts_options_browsertest.cc", |
| 2353 "../browser/ui/webui/options/chromeos/guest_mode_options_browsertest.cc" , | 2354 "../browser/ui/webui/options/chromeos/guest_mode_options_browsertest.cc" , |
| 2354 "../browser/ui/webui/options/chromeos/guest_mode_options_ui_browsertest. cc", | 2355 "../browser/ui/webui/options/chromeos/guest_mode_options_ui_browsertest. cc", |
| 2355 "../browser/ui/webui/options/chromeos/shared_options_browsertest.cc", | 2356 "../browser/ui/webui/options/chromeos/shared_options_browsertest.cc", |
| 2356 "//ui/base/ime/chromeos/input_method_whitelist.cc", | 2357 "//ui/base/ime/chromeos/input_method_whitelist.cc", |
| 2357 "//ui/base/ime/chromeos/input_method_whitelist.h", | 2358 "//ui/base/ime/chromeos/input_method_whitelist.h", |
| 2358 ] | 2359 ] |
| 2359 sources -= [ | 2360 sources -= [ |
|
tapted
2017/01/24 04:02:43
it would be nice to be consistent... I suppose thi
karandeepb
2017/01/24 06:12:23
Done.
| |
| 2360 "../../apps/load_and_launch_browsertest.cc", | 2361 "../../apps/load_and_launch_browsertest.cc", |
| 2361 "../browser/policy/policy_startup_browsertest.cc", | 2362 "../browser/policy/policy_startup_browsertest.cc", |
| 2362 | 2363 |
| 2363 # chromeos does not support profile list avatar menu | 2364 # chromeos does not support profile list avatar menu |
| 2364 "../browser/profiles/profile_list_desktop_browsertest.cc", | 2365 "../browser/profiles/profile_list_desktop_browsertest.cc", |
| 2365 "../browser/service_process/service_process_control_browsertest.cc", | 2366 "../browser/service_process/service_process_control_browsertest.cc", |
| 2366 | 2367 |
| 2367 # inline login UI is disabled on chromeos | 2368 # inline login UI is disabled on chromeos |
| 2368 "../browser/ui/webui/signin/inline_login_ui_browsertest.cc", | 2369 "../browser/ui/webui/signin/inline_login_ui_browsertest.cc", |
| 2369 | 2370 |
| (...skipping 2760 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5130 } | 5131 } |
| 5131 | 5132 |
| 5132 if (is_win) { | 5133 if (is_win) { |
| 5133 loadable_module("conflicts_dll") { | 5134 loadable_module("conflicts_dll") { |
| 5134 testonly = true | 5135 testonly = true |
| 5135 sources = [ | 5136 sources = [ |
| 5136 "conflicts/conflicts_dll.cc", | 5137 "conflicts/conflicts_dll.cc", |
| 5137 ] | 5138 ] |
| 5138 } | 5139 } |
| 5139 } | 5140 } |
| OLD | NEW |