Chromium Code Reviews| 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 536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 547 "../browser/ui/views/location_bar/page_action_image_view_interactive_u itest.cc", | 547 "../browser/ui/views/location_bar/page_action_image_view_interactive_u itest.cc", |
| 548 "../browser/ui/views/location_bar/star_view_browsertest.cc", | 548 "../browser/ui/views/location_bar/star_view_browsertest.cc", |
| 549 "../browser/ui/views/omnibox/omnibox_view_views_browsertest.cc", | 549 "../browser/ui/views/omnibox/omnibox_view_views_browsertest.cc", |
| 550 "../browser/ui/views/passwords/manage_passwords_bubble_view_interactiv e_uitest.cc", | 550 "../browser/ui/views/passwords/manage_passwords_bubble_view_interactiv e_uitest.cc", |
| 551 "../browser/ui/views/passwords/manage_passwords_icon_view_interactive_ uitest.cc", | 551 "../browser/ui/views/passwords/manage_passwords_icon_view_interactive_ uitest.cc", |
| 552 "../browser/ui/views/ssl_client_certificate_selector_browsertest.cc", | 552 "../browser/ui/views/ssl_client_certificate_selector_browsertest.cc", |
| 553 "../browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc", | 553 "../browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc", |
| 554 "../browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h", | 554 "../browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h", |
| 555 "../browser/ui/views/toolbar/toolbar_action_view_interactive_uitest.cc ", | 555 "../browser/ui/views/toolbar/toolbar_action_view_interactive_uitest.cc ", |
| 556 "../browser/ui/views/toolbar/toolbar_button_interactive_uitest.cc", | 556 "../browser/ui/views/toolbar/toolbar_button_interactive_uitest.cc", |
| 557 "../browser/ui/views/toolbar/toolbar_view_browsertest.cc", | |
| 557 "../browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc", | 558 "../browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc", |
|
sky
2016/10/11 19:24:09
It is confusing to have both a toolbar_view_browse
Qiang(Joe) Xu
2016/10/11 22:49:29
Done.
| |
| 558 "../browser/ui/views/translate/translate_bubble_test_utils_views.cc", | 559 "../browser/ui/views/translate/translate_bubble_test_utils_views.cc", |
| 559 "base/interactive_test_utils_views.cc", | 560 "base/interactive_test_utils_views.cc", |
| 560 ] | 561 ] |
| 561 } | 562 } |
| 562 if (is_linux) { | 563 if (is_linux) { |
| 563 if (!is_chromeos) { | 564 if (!is_chromeos) { |
| 564 # Desktop linux. | 565 # Desktop linux. |
| 565 sources -= [ | 566 sources -= [ |
| 566 # TODO(port): This times out. Attempts have been made to fix the | 567 # TODO(port): This times out. Attempts have been made to fix the |
| 567 # individual failures, but each time I disable a test from these | 568 # individual failures, but each time I disable a test from these |
| (...skipping 1542 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2110 "../browser/ui/views/extensions/bookmark_override_browsertest.cc", | 2111 "../browser/ui/views/extensions/bookmark_override_browsertest.cc", |
| 2111 "../browser/ui/views/extensions/extension_install_dialog_view_browsert est.cc", | 2112 "../browser/ui/views/extensions/extension_install_dialog_view_browsert est.cc", |
| 2112 "../browser/ui/views/extensions/extension_message_bubble_view_browsert est.cc", | 2113 "../browser/ui/views/extensions/extension_message_bubble_view_browsert est.cc", |
| 2113 "../browser/ui/views/frame/browser_non_client_frame_view_browsertest.c c", | 2114 "../browser/ui/views/frame/browser_non_client_frame_view_browsertest.c c", |
| 2114 "../browser/ui/views/frame/browser_view_browsertest.cc", | 2115 "../browser/ui/views/frame/browser_view_browsertest.cc", |
| 2115 "../browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc", | 2116 "../browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc", |
| 2116 "../browser/ui/views/media_router/media_router_ui_browsertest.cc", | 2117 "../browser/ui/views/media_router/media_router_ui_browsertest.cc", |
| 2117 "../browser/ui/views/passwords/password_dialog_view_browsertest.cc", | 2118 "../browser/ui/views/passwords/password_dialog_view_browsertest.cc", |
| 2118 "../browser/ui/views/task_manager_view_browsertest.cc", | 2119 "../browser/ui/views/task_manager_view_browsertest.cc", |
| 2119 "../browser/ui/views/toolbar/browser_actions_container_browsertest.cc" , | 2120 "../browser/ui/views/toolbar/browser_actions_container_browsertest.cc" , |
| 2120 "../browser/ui/views/toolbar/toolbar_view_browsertest.cc", | |
| 2121 "../browser/ui/views/translate/translate_bubble_view_browsertest.cc", | 2121 "../browser/ui/views/translate/translate_bubble_view_browsertest.cc", |
| 2122 "../browser/ui/views/web_dialog_view_browsertest.cc", | 2122 "../browser/ui/views/web_dialog_view_browsertest.cc", |
| 2123 ] | 2123 ] |
| 2124 } | 2124 } |
| 2125 } | 2125 } |
| 2126 | 2126 |
| 2127 if (is_linux && !is_component_build) { | 2127 if (is_linux && !is_component_build) { |
| 2128 # Set rpath to find the CDM adapter even in a non-component build. | 2128 # Set rpath to find the CDM adapter even in a non-component build. |
| 2129 configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] | 2129 configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] |
| 2130 } | 2130 } |
| (...skipping 2884 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5015 "touch_hud", | 5015 "touch_hud", |
| 5016 "ui", | 5016 "ui", |
| 5017 ] | 5017 ] |
| 5018 | 5018 |
| 5019 if (is_linux && !is_android) { | 5019 if (is_linux && !is_android) { |
| 5020 deps += [ "//components/font_service:manifest" ] | 5020 deps += [ "//components/font_service:manifest" ] |
| 5021 packaged_services += [ "font_service" ] | 5021 packaged_services += [ "font_service" ] |
| 5022 } | 5022 } |
| 5023 } | 5023 } |
| 5024 } | 5024 } |
| OLD | NEW |