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

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

Issue 2668833003: DialogBrowserTest implementation to invoke Content settings bubble dialogs. (Closed)
Patch Set: Merge fix from https://codereview.chromium.org/2663163004. This is temporary 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
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 2123 matching lines...) Expand 10 before | Expand all | Expand 10 after
2134 deps += [ ":test_support_applist_ash" ] 2134 deps += [ ":test_support_applist_ash" ]
2135 } 2135 }
2136 } 2136 }
2137 if (use_aura || toolkit_views) { 2137 if (use_aura || toolkit_views) {
2138 deps += [ "//ui/events:test_support" ] 2138 deps += [ "//ui/events:test_support" ]
2139 } 2139 }
2140 if (toolkit_views) { 2140 if (toolkit_views) {
2141 sources += [ 2141 sources += [
2142 "../browser/ui/global_error/global_error_service_browsertest.cc", 2142 "../browser/ui/global_error/global_error_service_browsertest.cc",
2143 "../browser/ui/views/external_protocol_dialog_browsertest.cc", 2143 "../browser/ui/views/external_protocol_dialog_browsertest.cc",
2144 "../browser/ui/views/frame/browser_non_client_frame_view_browsertest_win .cc", 2144 "../browser/ui/views/frame/browser_non_client_frame_view_browsertest_win .cc",
tapted 2017/02/03 23:07:03 The browser test should be added up here -- toolki
tapted 2017/02/06 09:34:31 I got it going on Mac with the CL at https://coder
2145 "../browser/ui/views/frame/browser_window_property_manager_browsertest_w in.cc", 2145 "../browser/ui/views/frame/browser_window_property_manager_browsertest_w in.cc",
2146 "../browser/ui/views/select_file_dialog_extension_browsertest.cc", 2146 "../browser/ui/views/select_file_dialog_extension_browsertest.cc",
2147 ] 2147 ]
2148 deps += [ "//ui/views" ] 2148 deps += [ "//ui/views" ]
2149 if (!is_chromeos && (!is_mac || mac_views_browser)) { 2149 if (!is_chromeos && (!is_mac || mac_views_browser)) {
2150 sources += [ "../browser/ui/views/profiles/profile_chooser_view_browsert est.cc" ] 2150 sources += [ "../browser/ui/views/profiles/profile_chooser_view_browsert est.cc" ]
2151 } 2151 }
2152 if (!is_mac || mac_views_browser) { 2152 if (!is_mac || mac_views_browser) {
2153 sources += [ 2153 sources += [
2154 # TODO(tapted): Move these to chrome_browser_tests_views_sources when the 2154 # TODO(tapted): Move these to chrome_browser_tests_views_sources when the
2155 # the corresponding files are moved in chrome_browser_ui.gypi (i.e. ou t of 2155 # the corresponding files are moved in chrome_browser_ui.gypi (i.e. ou t of
2156 # chrome_browser_ui_views_non_mac_sources). http://crbug.com/404979. 2156 # chrome_browser_ui_views_non_mac_sources). http://crbug.com/404979.
2157 "../browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc" , 2157 "../browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc" ,
2158 "../browser/ui/views/autofill/card_unmask_prompt_view_tester_views.cc" , 2158 "../browser/ui/views/autofill/card_unmask_prompt_view_tester_views.cc" ,
2159 "../browser/ui/views/autofill/card_unmask_prompt_view_tester_views.h", 2159 "../browser/ui/views/autofill/card_unmask_prompt_view_tester_views.h",
2160 "../browser/ui/views/autofill/password_generation_popup_view_tester_vi ews.cc", 2160 "../browser/ui/views/autofill/password_generation_popup_view_tester_vi ews.cc",
2161 "../browser/ui/views/autofill/password_generation_popup_view_tester_vi ews.h", 2161 "../browser/ui/views/autofill/password_generation_popup_view_tester_vi ews.h",
2162 "../browser/ui/views/bookmarks/bookmark_bubble_sign_in_delegate_browse rtest.cc", 2162 "../browser/ui/views/bookmarks/bookmark_bubble_sign_in_delegate_browse rtest.cc",
2163 "../browser/ui/views/collected_cookies_views_browsertest.cc", 2163 "../browser/ui/views/collected_cookies_views_browsertest.cc",
2164 "../browser/ui/views/extensions/bookmark_override_browsertest.cc", 2164 "../browser/ui/views/extensions/bookmark_override_browsertest.cc",
2165 "../browser/ui/views/extensions/extension_install_dialog_view_browsert est.cc", 2165 "../browser/ui/views/extensions/extension_install_dialog_view_browsert est.cc",
2166 "../browser/ui/views/extensions/extension_message_bubble_view_browsert est.cc", 2166 "../browser/ui/views/extensions/extension_message_bubble_view_browsert est.cc",
2167 "../browser/ui/views/extensions/extension_uninstall_dialog_view_browse rtest.cc", 2167 "../browser/ui/views/extensions/extension_uninstall_dialog_view_browse rtest.cc",
2168 "../browser/ui/views/frame/browser_non_client_frame_view_browsertest.c c", 2168 "../browser/ui/views/frame/browser_non_client_frame_view_browsertest.c c",
2169 "../browser/ui/views/frame/browser_view_browsertest.cc", 2169 "../browser/ui/views/frame/browser_view_browsertest.cc",
2170 "../browser/ui/views/location_bar/content_setting_bubble_dialog_browse rtest.cc",
2170 "../browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc", 2171 "../browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc",
2171 "../browser/ui/views/media_router/media_router_ui_browsertest.cc", 2172 "../browser/ui/views/media_router/media_router_ui_browsertest.cc",
2172 "../browser/ui/views/passwords/password_dialog_view_browsertest.cc", 2173 "../browser/ui/views/passwords/password_dialog_view_browsertest.cc",
2173 "../browser/ui/views/task_manager_view_browsertest.cc", 2174 "../browser/ui/views/task_manager_view_browsertest.cc",
2174 "../browser/ui/views/toolbar/browser_actions_container_browsertest.cc" , 2175 "../browser/ui/views/toolbar/browser_actions_container_browsertest.cc" ,
2175 "../browser/ui/views/translate/translate_bubble_view_browsertest.cc", 2176 "../browser/ui/views/translate/translate_bubble_view_browsertest.cc",
2176 "../browser/ui/views/web_dialog_view_browsertest.cc", 2177 "../browser/ui/views/web_dialog_view_browsertest.cc",
2177 ] 2178 ]
2178 } 2179 }
2179 } 2180 }
(...skipping 2973 matching lines...) Expand 10 before | Expand all | Expand 10 after
5153 } 5154 }
5154 5155
5155 if (is_win) { 5156 if (is_win) {
5156 loadable_module("conflicts_dll") { 5157 loadable_module("conflicts_dll") {
5157 testonly = true 5158 testonly = true
5158 sources = [ 5159 sources = [
5159 "conflicts/conflicts_dll.cc", 5160 "conflicts/conflicts_dll.cc",
5160 ] 5161 ]
5161 } 5162 }
5162 } 5163 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698