Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Side by Side Diff: chrome/test/BUILD.gn

Issue 2632653002: MacViews: Enable views based External Protocol dialog behind secondary-ui-md flag. (Closed)
Patch Set: Address review. Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 2114 matching lines...) Expand 10 before | Expand all | Expand 10 after
2125 if (enable_app_list) { 2125 if (enable_app_list) {
2126 deps += [ ":test_support_applist_ash" ] 2126 deps += [ ":test_support_applist_ash" ]
2127 } 2127 }
2128 } 2128 }
2129 if (use_aura || toolkit_views) { 2129 if (use_aura || toolkit_views) {
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/external_protocol_dialog_browsertest.cc",
2135 "../browser/ui/views/frame/browser_non_client_frame_view_browsertest_win .cc", 2136 "../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", 2137 "../browser/ui/views/frame/browser_window_property_manager_browsertest_w in.cc",
2137 "../browser/ui/views/select_file_dialog_extension_browsertest.cc", 2138 "../browser/ui/views/select_file_dialog_extension_browsertest.cc",
2138 ] 2139 ]
2139 deps += [ "//ui/views" ] 2140 deps += [ "//ui/views" ]
2140 if (!is_chromeos && (!is_mac || mac_views_browser)) { 2141 if (!is_chromeos && (!is_mac || mac_views_browser)) {
2141 sources += [ 2142 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 } 2143 }
2146 if (!is_mac || mac_views_browser) { 2144 if (!is_mac || mac_views_browser) {
2147 sources += [ 2145 sources += [
2148 # TODO(tapted): Move these to chrome_browser_tests_views_sources when the 2146 # 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 2147 # 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. 2148 # chrome_browser_ui_views_non_mac_sources). http://crbug.com/404979.
2151 "../browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc" , 2149 "../browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc" ,
2152 "../browser/ui/views/autofill/card_unmask_prompt_view_tester_views.cc" , 2150 "../browser/ui/views/autofill/card_unmask_prompt_view_tester_views.cc" ,
2153 "../browser/ui/views/autofill/card_unmask_prompt_view_tester_views.h", 2151 "../browser/ui/views/autofill/card_unmask_prompt_view_tester_views.h",
2154 "../browser/ui/views/autofill/password_generation_popup_view_tester_vi ews.cc", 2152 "../browser/ui/views/autofill/password_generation_popup_view_tester_vi ews.cc",
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
2356 "//ui/base/ime/chromeos/input_method_whitelist.cc", 2354 "//ui/base/ime/chromeos/input_method_whitelist.cc",
2357 "//ui/base/ime/chromeos/input_method_whitelist.h", 2355 "//ui/base/ime/chromeos/input_method_whitelist.h",
2358 ] 2356 ]
2359 sources -= [ 2357 sources -= [
2360 "../../apps/load_and_launch_browsertest.cc", 2358 "../../apps/load_and_launch_browsertest.cc",
2361 "../browser/policy/policy_startup_browsertest.cc", 2359 "../browser/policy/policy_startup_browsertest.cc",
2362 2360
2363 # chromeos does not support profile list avatar menu 2361 # chromeos does not support profile list avatar menu
2364 "../browser/profiles/profile_list_desktop_browsertest.cc", 2362 "../browser/profiles/profile_list_desktop_browsertest.cc",
2365 "../browser/service_process/service_process_control_browsertest.cc", 2363 "../browser/service_process/service_process_control_browsertest.cc",
2364 "../browser/ui/views/external_protocol_dialog_browsertest.cc",
2366 2365
2367 # inline login UI is disabled on chromeos 2366 # inline login UI is disabled on chromeos
2368 "../browser/ui/webui/signin/inline_login_ui_browsertest.cc", 2367 "../browser/ui/webui/signin/inline_login_ui_browsertest.cc",
2369 2368
2370 # chromeos does not use the desktop user manager 2369 # chromeos does not use the desktop user manager
2371 "../browser/ui/webui/signin/user_manager_ui_browsertest.cc", 2370 "../browser/ui/webui/signin/user_manager_ui_browsertest.cc",
2372 ] 2371 ]
2373 deps += [ 2372 deps += [
2374 "//chromeos/ime:gencode", 2373 "//chromeos/ime:gencode",
2375 "//components/arc:arc_test_support", 2374 "//components/arc:arc_test_support",
(...skipping 2754 matching lines...) Expand 10 before | Expand all | Expand 10 after
5130 } 5129 }
5131 5130
5132 if (is_win) { 5131 if (is_win) {
5133 loadable_module("conflicts_dll") { 5132 loadable_module("conflicts_dll") {
5134 testonly = true 5133 testonly = true
5135 sources = [ 5134 sources = [
5136 "conflicts/conflicts_dll.cc", 5135 "conflicts/conflicts_dll.cc",
5137 ] 5136 ]
5138 } 5137 }
5139 } 5138 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698