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

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

Issue 2632123003: Revert of MacViews: Allow the toolkit-views Enterprise Signin Confirmation Dialog to be used (Closed)
Patch Set: 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
« 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 2100 matching lines...) Expand 10 before | Expand all | Expand 10 after
2111 } 2111 }
2112 if (use_aura || toolkit_views) { 2112 if (use_aura || toolkit_views) {
2113 deps += [ "//ui/events:test_support" ] 2113 deps += [ "//ui/events:test_support" ]
2114 } 2114 }
2115 if (toolkit_views) { 2115 if (toolkit_views) {
2116 sources += [ 2116 sources += [
2117 "../browser/ui/global_error/global_error_service_browsertest.cc", 2117 "../browser/ui/global_error/global_error_service_browsertest.cc",
2118 "../browser/ui/views/frame/browser_non_client_frame_view_browsertest_win .cc", 2118 "../browser/ui/views/frame/browser_non_client_frame_view_browsertest_win .cc",
2119 "../browser/ui/views/frame/browser_window_property_manager_browsertest_w in.cc", 2119 "../browser/ui/views/frame/browser_window_property_manager_browsertest_w in.cc",
2120 "../browser/ui/views/select_file_dialog_extension_browsertest.cc", 2120 "../browser/ui/views/select_file_dialog_extension_browsertest.cc",
2121 "../browser/ui/views/sync/profile_signin_confirmation_dialog_views_brows ertest.cc",
2122 ] 2121 ]
2123 deps += [ "//ui/views" ] 2122 deps += [ "//ui/views" ]
2124 if (!is_chromeos && (!is_mac || mac_views_browser)) { 2123 if (!is_chromeos && (!is_mac || mac_views_browser)) {
2125 sources += [ 2124 sources += [
2126 "../browser/ui/views/external_protocol_dialog_browsertest.cc", 2125 "../browser/ui/views/external_protocol_dialog_browsertest.cc",
2127 "../browser/ui/views/profiles/profile_chooser_view_browsertest.cc", 2126 "../browser/ui/views/profiles/profile_chooser_view_browsertest.cc",
2128 ] 2127 ]
2129 } 2128 }
2130 if (!is_mac || mac_views_browser) { 2129 if (!is_mac || mac_views_browser) {
2131 sources += [ 2130 sources += [
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
2342 ] 2341 ]
2343 sources -= [ 2342 sources -= [
2344 "../../apps/load_and_launch_browsertest.cc", 2343 "../../apps/load_and_launch_browsertest.cc",
2345 "../browser/policy/policy_startup_browsertest.cc", 2344 "../browser/policy/policy_startup_browsertest.cc",
2346 2345
2347 # chromeos does not support profile list avatar menu 2346 # chromeos does not support profile list avatar menu
2348 "../browser/profiles/profile_list_desktop_browsertest.cc", 2347 "../browser/profiles/profile_list_desktop_browsertest.cc",
2349 "../browser/service_process/service_process_control_browsertest.cc", 2348 "../browser/service_process/service_process_control_browsertest.cc",
2350 2349
2351 # inline login UI is disabled on chromeos 2350 # inline login UI is disabled on chromeos
2352 "../browser/ui/views/sync/profile_signin_confirmation_dialog_views_brows ertest.cc",
2353 "../browser/ui/webui/signin/inline_login_ui_browsertest.cc", 2351 "../browser/ui/webui/signin/inline_login_ui_browsertest.cc",
2354 2352
2355 # chromeos does not use the desktop user manager 2353 # chromeos does not use the desktop user manager
2356 "../browser/ui/webui/signin/user_manager_ui_browsertest.cc", 2354 "../browser/ui/webui/signin/user_manager_ui_browsertest.cc",
2357 ] 2355 ]
2358 deps += [ 2356 deps += [
2359 "//chromeos/ime:gencode", 2357 "//chromeos/ime:gencode",
2360 "//components/arc:arc_test_support", 2358 "//components/arc:arc_test_support",
2361 "//components/user_manager:test_support", 2359 "//components/user_manager:test_support",
2362 "//ui/login:resources", 2360 "//ui/login:resources",
(...skipping 2742 matching lines...) Expand 10 before | Expand all | Expand 10 after
5105 } 5103 }
5106 5104
5107 if (is_win) { 5105 if (is_win) {
5108 loadable_module("conflicts_dll") { 5106 loadable_module("conflicts_dll") {
5109 testonly = true 5107 testonly = true
5110 sources = [ 5108 sources = [
5111 "conflicts/conflicts_dll.cc", 5109 "conflicts/conflicts_dll.cc",
5112 ] 5110 ]
5113 } 5111 }
5114 } 5112 }
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