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 2667773003: [reland] MacViews: Allow the toolkit-views Enterprise Signin Confirmation Dialog to be used (Closed)
Patch Set: clearer comment Created 3 years, 10 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
« no previous file with comments | « chrome/browser/ui/views/tab_dialogs_views.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2127 matching lines...) Expand 10 before | Expand all | Expand 10 after
2138 if (use_aura || toolkit_views) { 2138 if (use_aura || toolkit_views) {
2139 deps += [ "//ui/events:test_support" ] 2139 deps += [ "//ui/events:test_support" ]
2140 } 2140 }
2141 if (toolkit_views) { 2141 if (toolkit_views) {
2142 sources += [ 2142 sources += [
2143 "../browser/ui/global_error/global_error_service_browsertest.cc", 2143 "../browser/ui/global_error/global_error_service_browsertest.cc",
2144 "../browser/ui/views/external_protocol_dialog_browsertest.cc", 2144 "../browser/ui/views/external_protocol_dialog_browsertest.cc",
2145 "../browser/ui/views/frame/browser_non_client_frame_view_browsertest_win .cc", 2145 "../browser/ui/views/frame/browser_non_client_frame_view_browsertest_win .cc",
2146 "../browser/ui/views/frame/browser_window_property_manager_browsertest_w in.cc", 2146 "../browser/ui/views/frame/browser_window_property_manager_browsertest_w in.cc",
2147 "../browser/ui/views/select_file_dialog_extension_browsertest.cc", 2147 "../browser/ui/views/select_file_dialog_extension_browsertest.cc",
2148 "../browser/ui/views/sync/profile_signin_confirmation_dialog_views_brows ertest.cc",
2148 ] 2149 ]
2149 deps += [ "//ui/views" ] 2150 deps += [ "//ui/views" ]
2150 if (!is_chromeos && (!is_mac || mac_views_browser)) { 2151 if (!is_chromeos && (!is_mac || mac_views_browser)) {
2151 sources += [ "../browser/ui/views/profiles/profile_chooser_view_browsert est.cc" ] 2152 sources += [ "../browser/ui/views/profiles/profile_chooser_view_browsert est.cc" ]
2152 } 2153 }
2153 if (!is_mac || mac_views_browser) { 2154 if (!is_mac || mac_views_browser) {
2154 sources += [ 2155 sources += [
2155 # TODO(tapted): Move these to chrome_browser_tests_views_sources when the 2156 # TODO(tapted): Move these to chrome_browser_tests_views_sources when the
2156 # the corresponding files are moved in chrome_browser_ui.gypi (i.e. ou t of 2157 # the corresponding files are moved in chrome_browser_ui.gypi (i.e. ou t of
2157 # chrome_browser_ui_views_non_mac_sources). http://crbug.com/404979. 2158 # chrome_browser_ui_views_non_mac_sources). http://crbug.com/404979.
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
2366 sources -= [ 2367 sources -= [
2367 "../../apps/load_and_launch_browsertest.cc", 2368 "../../apps/load_and_launch_browsertest.cc",
2368 "../browser/policy/policy_startup_browsertest.cc", 2369 "../browser/policy/policy_startup_browsertest.cc",
2369 2370
2370 # chromeos does not support profile list avatar menu 2371 # chromeos does not support profile list avatar menu
2371 "../browser/profiles/profile_list_desktop_browsertest.cc", 2372 "../browser/profiles/profile_list_desktop_browsertest.cc",
2372 "../browser/service_process/service_process_control_browsertest.cc", 2373 "../browser/service_process/service_process_control_browsertest.cc",
2373 "../browser/ui/views/external_protocol_dialog_browsertest.cc", 2374 "../browser/ui/views/external_protocol_dialog_browsertest.cc",
2374 2375
2375 # inline login UI is disabled on chromeos 2376 # inline login UI is disabled on chromeos
2377 "../browser/ui/views/sync/profile_signin_confirmation_dialog_views_brows ertest.cc",
2376 "../browser/ui/webui/signin/inline_login_ui_browsertest.cc", 2378 "../browser/ui/webui/signin/inline_login_ui_browsertest.cc",
2377 2379
2378 # chromeos does not use the desktop user manager 2380 # chromeos does not use the desktop user manager
2379 "../browser/ui/webui/signin/user_manager_ui_browsertest.cc", 2381 "../browser/ui/webui/signin/user_manager_ui_browsertest.cc",
2380 ] 2382 ]
2381 deps += [ 2383 deps += [
2382 "//chrome/browser/chromeos:arc_test_support", 2384 "//chrome/browser/chromeos:arc_test_support",
2383 "//chromeos/ime:gencode", 2385 "//chromeos/ime:gencode",
2384 "//components/arc:arc_test_support", 2386 "//components/arc:arc_test_support",
2385 "//components/user_manager:test_support", 2387 "//components/user_manager:test_support",
(...skipping 2776 matching lines...) Expand 10 before | Expand all | Expand 10 after
5162 } 5164 }
5163 5165
5164 if (is_win) { 5166 if (is_win) {
5165 loadable_module("conflicts_dll") { 5167 loadable_module("conflicts_dll") {
5166 testonly = true 5168 testonly = true
5167 sources = [ 5169 sources = [
5168 "conflicts/conflicts_dll.cc", 5170 "conflicts/conflicts_dll.cc",
5169 ] 5171 ]
5170 } 5172 }
5171 } 5173 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tab_dialogs_views.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698