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 555 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
566 if (!is_chromeos) { | 566 if (!is_chromeos) { |
567 # Desktop linux. | 567 # Desktop linux. |
568 sources -= [ | 568 sources -= [ |
569 # TODO(port): This times out. Attempts have been made to fix the | 569 # TODO(port): This times out. Attempts have been made to fix the |
570 # individual failures, but each time I disable a test from these | 570 # individual failures, but each time I disable a test from these |
571 # suites, it seems like one or another starts timing out too. | 571 # suites, it seems like one or another starts timing out too. |
572 "../browser/ui/views/keyboard_access_browsertest.cc", | 572 "../browser/ui/views/keyboard_access_browsertest.cc", |
573 ] | 573 ] |
574 if (!use_ozone) { | 574 if (!use_ozone) { |
575 sources += [ "../browser/ui/libgtk2ui/select_file_dialog_interactive
_uitest.cc" ] | 575 sources += [ "../browser/ui/libgtk2ui/select_file_dialog_interactive
_uitest.cc" ] |
576 configs += [ "//build/config/linux/gtk2:gtk2_internal_config" ] | 576 if (use_gtk3) { |
| 577 configs += [ "//build/config/linux/gtk3:gtk3_internal_config" ] |
| 578 } else { |
| 579 configs += [ "//build/config/linux/gtk2:gtk2_internal_config" ] |
| 580 } |
577 } | 581 } |
578 } | 582 } |
579 } | 583 } |
580 if (is_chromeos || !use_x11) { | 584 if (is_chromeos || !use_x11) { |
581 sources -= [ | 585 sources -= [ |
582 "//ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interacti
ve_uitest.cc", | 586 "//ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interacti
ve_uitest.cc", |
583 "//ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_
uitest.cc", | 587 "//ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_
uitest.cc", |
584 ] | 588 ] |
585 } | 589 } |
586 if (use_aura || is_mac) { | 590 if (use_aura || is_mac) { |
(...skipping 4415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5002 "touch_hud", | 5006 "touch_hud", |
5003 "ui", | 5007 "ui", |
5004 ] | 5008 ] |
5005 | 5009 |
5006 if (is_linux && !is_android) { | 5010 if (is_linux && !is_android) { |
5007 deps += [ "//components/font_service:manifest" ] | 5011 deps += [ "//components/font_service:manifest" ] |
5008 packaged_services += [ "font_service" ] | 5012 packaged_services += [ "font_service" ] |
5009 } | 5013 } |
5010 } | 5014 } |
5011 } | 5015 } |
OLD | NEW |