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 571 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
582 } | 582 } |
583 } | 583 } |
584 } | 584 } |
585 if (is_chromeos || !use_x11) { | 585 if (is_chromeos || !use_x11) { |
586 sources -= [ | 586 sources -= [ |
587 "//ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interacti ve_uitest.cc", | 587 "//ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interacti ve_uitest.cc", |
588 "//ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_ uitest.cc", | 588 "//ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_ uitest.cc", |
589 ] | 589 ] |
590 } | 590 } |
591 if (use_aura || is_mac) { | 591 if (use_aura || is_mac) { |
592 if (!is_mac) { | |
sky
2016/10/21 03:14:18
I would rather you add an use_aura case. Having a
Qiang(Joe) Xu
2016/10/21 16:23:06
Done.
| |
593 sources += | |
594 [ "//ui/views/widget/native_widget_aura_interactive_uitest.cc" ] | |
595 } | |
596 | |
592 # TODO(ekaramad): These tests are activated for aura and mac only. They | 597 # TODO(ekaramad): These tests are activated for aura and mac only. They |
593 # should be moved to 'interactive_ui_tests' sources for all platforms | 598 # should be moved to 'interactive_ui_tests' sources for all platforms |
594 # once https://crbug.com/578168 is fixed. | 599 # once https://crbug.com/578168 is fixed. |
595 sources += [ "//chrome/browser/renderer_host/site_per_process_text_input _browsertest.cc" ] | 600 sources += [ "//chrome/browser/renderer_host/site_per_process_text_input _browsertest.cc" ] |
596 deps += [ "//ui/touch_selection" ] | 601 deps += [ "//ui/touch_selection" ] |
597 } | 602 } |
598 } | 603 } |
599 | 604 |
600 if (!is_desktop_linux) { | 605 if (!is_desktop_linux) { |
601 # Everything but desktop Linux. | 606 # Everything but desktop Linux. |
(...skipping 1513 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2115 "../browser/ui/views/extensions/bookmark_override_browsertest.cc", | 2120 "../browser/ui/views/extensions/bookmark_override_browsertest.cc", |
2116 "../browser/ui/views/extensions/extension_install_dialog_view_browsert est.cc", | 2121 "../browser/ui/views/extensions/extension_install_dialog_view_browsert est.cc", |
2117 "../browser/ui/views/extensions/extension_message_bubble_view_browsert est.cc", | 2122 "../browser/ui/views/extensions/extension_message_bubble_view_browsert est.cc", |
2118 "../browser/ui/views/frame/browser_non_client_frame_view_browsertest.c c", | 2123 "../browser/ui/views/frame/browser_non_client_frame_view_browsertest.c c", |
2119 "../browser/ui/views/frame/browser_view_browsertest.cc", | 2124 "../browser/ui/views/frame/browser_view_browsertest.cc", |
2120 "../browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc", | 2125 "../browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc", |
2121 "../browser/ui/views/media_router/media_router_ui_browsertest.cc", | 2126 "../browser/ui/views/media_router/media_router_ui_browsertest.cc", |
2122 "../browser/ui/views/passwords/password_dialog_view_browsertest.cc", | 2127 "../browser/ui/views/passwords/password_dialog_view_browsertest.cc", |
2123 "../browser/ui/views/task_manager_view_browsertest.cc", | 2128 "../browser/ui/views/task_manager_view_browsertest.cc", |
2124 "../browser/ui/views/toolbar/browser_actions_container_browsertest.cc" , | 2129 "../browser/ui/views/toolbar/browser_actions_container_browsertest.cc" , |
2125 "../browser/ui/views/toolbar/toolbar_view_browsertest.cc", | |
2126 "../browser/ui/views/translate/translate_bubble_view_browsertest.cc", | 2130 "../browser/ui/views/translate/translate_bubble_view_browsertest.cc", |
2127 "../browser/ui/views/web_dialog_view_browsertest.cc", | 2131 "../browser/ui/views/web_dialog_view_browsertest.cc", |
2128 ] | 2132 ] |
2129 } | 2133 } |
2130 } | 2134 } |
2131 | 2135 |
2132 if (is_linux && !is_component_build) { | 2136 if (is_linux && !is_component_build) { |
2133 # Set rpath to find the CDM adapter even in a non-component build. | 2137 # Set rpath to find the CDM adapter even in a non-component build. |
2134 configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] | 2138 configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] |
2135 } | 2139 } |
(...skipping 2890 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
5026 "touch_hud", | 5030 "touch_hud", |
5027 "ui", | 5031 "ui", |
5028 ] | 5032 ] |
5029 | 5033 |
5030 if (is_linux && !is_android) { | 5034 if (is_linux && !is_android) { |
5031 deps += [ "//components/font_service:manifest" ] | 5035 deps += [ "//components/font_service:manifest" ] |
5032 packaged_services += [ "font_service" ] | 5036 packaged_services += [ "font_service" ] |
5033 } | 5037 } |
5034 } | 5038 } |
5035 } | 5039 } |
OLD | NEW |