Chromium Code Reviews| Index: ui/views/BUILD.gn |
| diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn |
| index e83f5b971dae51dcd218ab7f6538042e95bd84c0..a90a5c188e4f39c642068f52834d8887c82c0e8c 100644 |
| --- a/ui/views/BUILD.gn |
| +++ b/ui/views/BUILD.gn |
| @@ -906,7 +906,6 @@ source_set("views_unittests_sources") { |
| "widget/native_widget_unittest.cc", |
| "widget/root_view_unittest.cc", |
| "widget/widget_unittest.cc", |
| - "widget/window_reorderer_unittest.cc", |
| "window/custom_frame_view_unittest.cc", |
| "window/dialog_client_view_unittest.cc", |
| "window/dialog_delegate_unittest.cc", |
| @@ -984,10 +983,8 @@ source_set("views_unittests_sources") { |
| sources += [ |
| "accessibility/ax_aura_obj_cache_unittest.cc", |
| "controls/native/native_view_host_aura_unittest.cc", |
| - "corewm/tooltip_controller_unittest.cc", |
| "touchui/touch_selection_menu_runner_views_unittest.cc", |
| "view_unittest_aura.cc", |
| - "widget/native_widget_aura_unittest.cc", |
| ] |
| public_deps += [ |
| "//ui/aura", |
| @@ -1002,7 +999,6 @@ source_set("views_unittests_sources") { |
| sources -= [ |
| "bubble/bubble_window_targeter_unittest.cc", |
| "controls/native/native_view_host_unittest.cc", |
| - "widget/window_reorderer_unittest.cc", |
| ] |
| public_deps += [ "//ui/accelerated_widget_mac" ] |
| } |
| @@ -1020,10 +1016,21 @@ test("views_unittests") { |
| if (use_aura) { |
| sources += [ |
| + # These tests currently use AuraTestBase, but then try to use views |
|
sky
2017/04/10 23:53:26
Please file a bug on these so we can update them.
|
| + # objects. Thus, when they are run in views_mus_unittests, they test the |
| + # local aura path instead of the remote mus path, so pull them out. |
| # Some of the tests need drag-drop support. crbug.com/614037 |
|
Elliot Glaysher
2017/04/10 23:46:14
git cl format is preventing me from separating the
|
| + "corewm/tooltip_controller_unittest.cc", |
| "touchui/touch_selection_controller_impl_unittest.cc", |
| + "widget/native_widget_aura_unittest.cc", |
| + "widget/window_reorderer_unittest.cc", |
| ] |
| + if (is_mac) { |
| + # views_unittests not yet compiling on Mac. http://crbug.com/378134 |
| + sources -= [ "widget/window_reorderer_unittest.cc" ] |
| + } |
| + |
| if (!is_chromeos) { |
| sources += [ |
| "widget/desktop_aura/desktop_focus_rules_unittest.cc", |