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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/views/BUILD.gn

Issue 2291803002: Remove views.gypi, inline sources into GN files. (Closed)
Patch Set: Remove shared file Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « .gn ('k') | ui/views/mus/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/BUILD.gn
diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn
index 19d98609ff97c24223a2197ced3dce5fd0966baf..46d1244c1b31b16936c5388d11d401aacc17dec2 100644
--- a/ui/views/BUILD.gn
+++ b/ui/views/BUILD.gn
@@ -6,18 +6,371 @@ import("//build/config/features.gni")
import("//build/config/ui.gni")
import("//testing/test.gni")
-gypi_values = exec_script("//build/gypi_to_gn.py",
- [ rebase_path("views.gyp") ],
- "scope",
- [ "views.gyp" ])
-
config("flags") {
defines = [ "TOOLKIT_VIEWS=1" ]
}
component("views") {
all_dependent_configs = [ ":flags" ]
- sources = gypi_values.views_sources
+ sources = [
+ "accessibility/native_view_accessibility.cc",
+ "accessibility/native_view_accessibility.h",
+ "accessibility/native_view_accessibility_win.cc",
+ "accessibility/native_view_accessibility_win.h",
+ "accessible_pane_view.cc",
+ "accessible_pane_view.h",
+ "animation/bounds_animator.cc",
+ "animation/bounds_animator.h",
+ "animation/flood_fill_ink_drop_ripple.cc",
+ "animation/flood_fill_ink_drop_ripple.h",
+ "animation/ink_drop.h",
+ "animation/ink_drop_animation_ended_reason.cc",
+ "animation/ink_drop_animation_ended_reason.h",
+ "animation/ink_drop_highlight.cc",
+ "animation/ink_drop_highlight.h",
+ "animation/ink_drop_highlight_observer.h",
+ "animation/ink_drop_host.h",
+ "animation/ink_drop_host_view.cc",
+ "animation/ink_drop_host_view.h",
+ "animation/ink_drop_impl.cc",
+ "animation/ink_drop_impl.h",
+ "animation/ink_drop_painted_layer_delegates.cc",
+ "animation/ink_drop_painted_layer_delegates.h",
+ "animation/ink_drop_ripple.cc",
+ "animation/ink_drop_ripple.h",
+ "animation/ink_drop_ripple_observer.h",
+ "animation/ink_drop_state.cc",
+ "animation/ink_drop_state.h",
+ "animation/ink_drop_stub.cc",
+ "animation/ink_drop_stub.h",
+ "animation/scroll_animator.cc",
+ "animation/scroll_animator.h",
+ "animation/square_ink_drop_ripple.cc",
+ "animation/square_ink_drop_ripple.h",
+ "background.cc",
+ "background.h",
+ "border.cc",
+ "border.h",
+ "bubble/bubble_border.cc",
+ "bubble/bubble_border.h",
+ "bubble/bubble_dialog_delegate.cc",
+ "bubble/bubble_dialog_delegate.h",
+ "bubble/bubble_frame_view.cc",
+ "bubble/bubble_frame_view.h",
+ "button_drag_utils.cc",
+ "button_drag_utils.h",
+ "cocoa/bridged_content_view.h",
+ "cocoa/bridged_content_view.mm",
+ "cocoa/bridged_native_widget.h",
+ "cocoa/bridged_native_widget.mm",
+ "cocoa/bridged_native_widget_owner.h",
+ "cocoa/cocoa_mouse_capture.h",
+ "cocoa/cocoa_mouse_capture.mm",
+ "cocoa/cocoa_mouse_capture_delegate.h",
+ "cocoa/cocoa_window_move_loop.h",
+ "cocoa/cocoa_window_move_loop.mm",
+ "cocoa/drag_drop_client_mac.h",
+ "cocoa/drag_drop_client_mac.mm",
+ "cocoa/native_widget_mac_nswindow.h",
+ "cocoa/native_widget_mac_nswindow.mm",
+ "cocoa/tooltip_manager_mac.h",
+ "cocoa/tooltip_manager_mac.mm",
+ "cocoa/views_nswindow_delegate.h",
+ "cocoa/views_nswindow_delegate.mm",
+ "cocoa/views_scrollbar_bridge.h",
+ "cocoa/views_scrollbar_bridge.mm",
+ "cocoa/widget_owner_nswindow_adapter.h",
+ "cocoa/widget_owner_nswindow_adapter.mm",
+ "color_chooser/color_chooser_listener.h",
+ "color_chooser/color_chooser_view.cc",
+ "color_chooser/color_chooser_view.h",
+ "context_menu_controller.h",
+ "controls/button/blue_button.cc",
+ "controls/button/blue_button.h",
+ "controls/button/button.cc",
+ "controls/button/button.h",
+ "controls/button/checkbox.cc",
+ "controls/button/checkbox.h",
+ "controls/button/custom_button.cc",
+ "controls/button/custom_button.h",
+ "controls/button/image_button.cc",
+ "controls/button/image_button.h",
+ "controls/button/label_button.cc",
+ "controls/button/label_button.h",
+ "controls/button/label_button_border.cc",
+ "controls/button/label_button_border.h",
+ "controls/button/md_text_button.cc",
+ "controls/button/md_text_button.h",
+ "controls/button/menu_button.cc",
+ "controls/button/menu_button.h",
+ "controls/button/menu_button_listener.h",
+ "controls/button/radio_button.cc",
+ "controls/button/radio_button.h",
+ "controls/button/toggle_button.cc",
+ "controls/button/toggle_button.h",
+ "controls/combobox/combobox.cc",
+ "controls/combobox/combobox.h",
+ "controls/combobox/combobox_listener.h",
+ "controls/focusable_border.cc",
+ "controls/focusable_border.h",
+ "controls/focusable_rounded_border_mac.cc",
+ "controls/focusable_rounded_border_mac.h",
+ "controls/glow_hover_controller.cc",
+ "controls/glow_hover_controller.h",
+ "controls/image_view.cc",
+ "controls/image_view.h",
+ "controls/label.cc",
+ "controls/label.h",
+ "controls/link.cc",
+ "controls/link.h",
+ "controls/link_listener.h",
+ "controls/menu/display_change_listener_mac.cc",
+ "controls/menu/menu_config.cc",
+ "controls/menu/menu_config.h",
+ "controls/menu/menu_config_chromeos.cc",
+ "controls/menu/menu_config_linux.cc",
+ "controls/menu/menu_config_mac.mm",
+ "controls/menu/menu_config_win.cc",
+ "controls/menu/menu_controller.cc",
+ "controls/menu/menu_controller.h",
+ "controls/menu/menu_controller_delegate.h",
+ "controls/menu/menu_delegate.cc",
+ "controls/menu/menu_delegate.h",
+ "controls/menu/menu_host.cc",
+ "controls/menu/menu_host.h",
+ "controls/menu/menu_host_root_view.cc",
+ "controls/menu/menu_host_root_view.h",
+ "controls/menu/menu_image_util.cc",
+ "controls/menu/menu_image_util.h",
+ "controls/menu/menu_insertion_delegate_win.h",
+ "controls/menu/menu_item_view.cc",
+ "controls/menu/menu_item_view.h",
+ "controls/menu/menu_listener.cc",
+ "controls/menu/menu_listener.h",
+ "controls/menu/menu_message_loop.h",
+ "controls/menu/menu_message_loop_mac.cc",
+ "controls/menu/menu_message_loop_mac.h",
+ "controls/menu/menu_model_adapter.cc",
+ "controls/menu/menu_model_adapter.h",
+ "controls/menu/menu_runner.cc",
+ "controls/menu/menu_runner.h",
+ "controls/menu/menu_runner_handler.h",
+ "controls/menu/menu_runner_impl.cc",
+ "controls/menu/menu_runner_impl.h",
+ "controls/menu/menu_runner_impl_adapter.cc",
+ "controls/menu/menu_runner_impl_adapter.h",
+ "controls/menu/menu_runner_impl_cocoa.h",
+ "controls/menu/menu_runner_impl_cocoa.mm",
+ "controls/menu/menu_runner_impl_interface.h",
+ "controls/menu/menu_scroll_view_container.cc",
+ "controls/menu/menu_scroll_view_container.h",
+ "controls/menu/menu_separator.h",
+ "controls/menu/menu_separator_views.cc",
+ "controls/menu/menu_separator_win.cc",
+ "controls/menu/menu_types.h",
+ "controls/menu/native_menu_win.cc",
+ "controls/menu/native_menu_win.h",
+ "controls/menu/submenu_view.cc",
+ "controls/menu/submenu_view.h",
+ "controls/message_box_view.cc",
+ "controls/message_box_view.h",
+ "controls/native/native_view_host.cc",
+ "controls/native/native_view_host.h",
+ "controls/native/native_view_host_mac.h",
+ "controls/native/native_view_host_mac.mm",
+ "controls/prefix_delegate.h",
+ "controls/prefix_selector.cc",
+ "controls/prefix_selector.h",
+ "controls/progress_bar.cc",
+ "controls/progress_bar.h",
+ "controls/resize_area.cc",
+ "controls/resize_area.h",
+ "controls/resize_area_delegate.h",
+ "controls/scroll_view.cc",
+ "controls/scroll_view.h",
+ "controls/scrollbar/base_scroll_bar.cc",
+ "controls/scrollbar/base_scroll_bar.h",
+ "controls/scrollbar/base_scroll_bar_button.cc",
+ "controls/scrollbar/base_scroll_bar_button.h",
+ "controls/scrollbar/base_scroll_bar_thumb.cc",
+ "controls/scrollbar/base_scroll_bar_thumb.h",
+ "controls/scrollbar/cocoa_scroll_bar.h",
+ "controls/scrollbar/cocoa_scroll_bar.mm",
+ "controls/scrollbar/native_scroll_bar.cc",
+ "controls/scrollbar/native_scroll_bar.h",
+ "controls/scrollbar/native_scroll_bar_views.cc",
+ "controls/scrollbar/native_scroll_bar_views.h",
+ "controls/scrollbar/native_scroll_bar_wrapper.h",
+ "controls/scrollbar/overlay_scroll_bar.cc",
+ "controls/scrollbar/overlay_scroll_bar.h",
+ "controls/scrollbar/scroll_bar.cc",
+ "controls/scrollbar/scroll_bar.h",
+ "controls/separator.cc",
+ "controls/separator.h",
+ "controls/slide_out_view.cc",
+ "controls/slide_out_view.h",
+ "controls/slider.cc",
+ "controls/slider.h",
+ "controls/styled_label.cc",
+ "controls/styled_label.h",
+ "controls/styled_label_listener.h",
+ "controls/tabbed_pane/tabbed_pane.cc",
+ "controls/tabbed_pane/tabbed_pane.h",
+ "controls/tabbed_pane/tabbed_pane_listener.h",
+ "controls/table/table_header.cc",
+ "controls/table/table_header.h",
+ "controls/table/table_utils.cc",
+ "controls/table/table_utils.h",
+ "controls/table/table_view.cc",
+ "controls/table/table_view.h",
+ "controls/table/table_view_observer.h",
+ "controls/table/table_view_row_background_painter.h",
+ "controls/textfield/textfield.cc",
+ "controls/textfield/textfield.h",
+ "controls/textfield/textfield_controller.cc",
+ "controls/textfield/textfield_controller.h",
+ "controls/textfield/textfield_model.cc",
+ "controls/textfield/textfield_model.h",
+ "controls/throbber.cc",
+ "controls/throbber.h",
+ "controls/tree/tree_view.cc",
+ "controls/tree/tree_view.h",
+ "controls/tree/tree_view_controller.cc",
+ "controls/tree/tree_view_controller.h",
+ "debug_utils.cc",
+ "debug_utils.h",
+ "drag_controller.h",
+ "drag_utils.cc",
+ "drag_utils.h",
+ "drag_utils_mac.mm",
+ "event_monitor.h",
+ "event_monitor_mac.h",
+ "event_monitor_mac.mm",
+ "focus/external_focus_tracker.cc",
+ "focus/external_focus_tracker.h",
+ "focus/focus_manager.cc",
+ "focus/focus_manager.h",
+ "focus/focus_manager_delegate.h",
+ "focus/focus_manager_factory.cc",
+ "focus/focus_manager_factory.h",
+ "focus/focus_search.cc",
+ "focus/focus_search.h",
+ "focus/view_storage.cc",
+ "focus/view_storage.h",
+ "focus/widget_focus_manager.cc",
+ "focus/widget_focus_manager.h",
+ "layout/box_layout.cc",
+ "layout/box_layout.h",
+ "layout/fill_layout.cc",
+ "layout/fill_layout.h",
+ "layout/grid_layout.cc",
+ "layout/grid_layout.h",
+ "layout/layout_constants.h",
+ "layout/layout_manager.cc",
+ "layout/layout_manager.h",
+ "linux_ui/linux_ui.cc",
+ "linux_ui/linux_ui.h",
+ "linux_ui/status_icon_linux.cc",
+ "linux_ui/status_icon_linux.h",
+ "linux_ui/window_button_order_observer.h",
+ "linux_ui/window_button_order_provider.cc",
+ "masked_targeter_delegate.cc",
+ "masked_targeter_delegate.h",
+ "metrics.cc",
+ "metrics.h",
+ "metrics_mac.cc",
+ "mouse_constants.h",
+ "mouse_watcher.cc",
+ "mouse_watcher.h",
+ "mouse_watcher_view_host.cc",
+ "mouse_watcher_view_host.h",
+ "native_cursor.h",
+ "native_cursor_mac.mm",
+ "native_theme_delegate.h",
+ "painter.cc",
+ "painter.h",
+ "pointer_watcher.h",
+ "rect_based_targeting_utils.cc",
+ "rect_based_targeting_utils.h",
+ "repeat_controller.cc",
+ "repeat_controller.h",
+ "round_rect_painter.cc",
+ "round_rect_painter.h",
+ "shadow_border.cc",
+ "shadow_border.h",
+ "style/mac/combobox_background_mac.cc",
+ "style/mac/combobox_background_mac.h",
+ "style/mac/dialog_button_border_mac.cc",
+ "style/mac/dialog_button_border_mac.h",
+ "style/platform_style.cc",
+ "style/platform_style.h",
+ "style/platform_style_mac.mm",
+ "view.cc",
+ "view.h",
+ "view_constants.cc",
+ "view_constants.h",
+ "view_model.cc",
+ "view_model.h",
+ "view_model_utils.cc",
+ "view_model_utils.h",
+ "view_targeter.cc",
+ "view_targeter.h",
+ "view_targeter_delegate.cc",
+ "view_targeter_delegate.h",
+ "views_delegate.cc",
+ "views_delegate.h",
+ "views_export.h",
+ "views_exports.cc",
+ "views_switches.cc",
+ "views_switches.h",
+ "views_touch_selection_controller_factory.h",
+ "views_touch_selection_controller_factory_mac.cc",
+ "widget/drop_helper.cc",
+ "widget/drop_helper.h",
+ "widget/monitor_win.cc",
+ "widget/monitor_win.h",
+ "widget/native_widget.h",
+ "widget/native_widget_delegate.h",
+ "widget/native_widget_mac.h",
+ "widget/native_widget_mac.mm",
+ "widget/native_widget_private.h",
+ "widget/root_view.cc",
+ "widget/root_view.h",
+ "widget/root_view_targeter.cc",
+ "widget/root_view_targeter.h",
+ "widget/tooltip_manager.cc",
+ "widget/tooltip_manager.h",
+ "widget/widget.cc",
+ "widget/widget.h",
+ "widget/widget_aura_utils.cc",
+ "widget/widget_aura_utils.h",
+ "widget/widget_delegate.cc",
+ "widget/widget_delegate.h",
+ "widget/widget_deletion_observer.cc",
+ "widget/widget_deletion_observer.h",
+ "widget/widget_observer.h",
+ "widget/widget_removals_observer.h",
+ "window/client_view.cc",
+ "window/client_view.h",
+ "window/custom_frame_view.cc",
+ "window/custom_frame_view.h",
+ "window/dialog_client_view.cc",
+ "window/dialog_client_view.h",
+ "window/dialog_delegate.cc",
+ "window/dialog_delegate.h",
+ "window/frame_background.cc",
+ "window/frame_background.h",
+ "window/frame_buttons.h",
+ "window/native_frame_view.cc",
+ "window/native_frame_view.h",
+ "window/non_client_view.cc",
+ "window/non_client_view.h",
+ "window/window_button_order_provider.cc",
+ "window/window_button_order_provider.h",
+ "window/window_resources.h",
+ "window/window_shape.cc",
+ "window/window_shape.h",
+ ]
configs += [
"//build/config:precompiled_headers",
@@ -81,7 +434,21 @@ component("views") {
}
if (is_win) {
- sources += gypi_values.views_win_sources
+ sources += [
+ "widget/widget_hwnd_utils.cc",
+ "widget/widget_hwnd_utils.h",
+ "win/fullscreen_handler.cc",
+ "win/fullscreen_handler.h",
+ "win/hwnd_message_handler.cc",
+ "win/hwnd_message_handler.h",
+ "win/hwnd_message_handler_delegate.h",
+ "win/hwnd_util.h",
+ "win/hwnd_util_aurawin.cc",
+ "win/scoped_fullscreen_visibility.cc",
+ "win/scoped_fullscreen_visibility.h",
+ "win/windows_session_change_observer.cc",
+ "win/windows_session_change_observer.h",
+ ]
libs = [
"dwmapi.lib",
"imm32.lib",
@@ -112,24 +479,130 @@ component("views") {
}
if (use_aura) {
- sources += gypi_values.views_aura_sources
+ sources += [
+ "accessibility/ax_aura_obj_cache.cc",
+ "accessibility/ax_aura_obj_cache.h",
+ "accessibility/ax_view_obj_wrapper.cc",
+ "accessibility/ax_view_obj_wrapper.h",
+ "accessibility/ax_widget_obj_wrapper.cc",
+ "accessibility/ax_widget_obj_wrapper.h",
+ "accessibility/ax_window_obj_wrapper.cc",
+ "accessibility/ax_window_obj_wrapper.h",
+ "bubble/bubble_window_targeter.cc",
+ "bubble/bubble_window_targeter.h",
+ "bubble/tray_bubble_view.cc",
+ "bubble/tray_bubble_view.h",
+ "controls/menu/display_change_listener_aura.cc",
+ "controls/menu/menu_message_loop_aura.cc",
+ "controls/menu/menu_message_loop_aura.h",
+ "controls/menu/menu_pre_target_handler.cc",
+ "controls/menu/menu_pre_target_handler.h",
+ "controls/native/native_view_host_aura.cc",
+ "controls/native/native_view_host_aura.h",
+ "corewm/cursor_height_provider_win.cc",
+ "corewm/cursor_height_provider_win.h",
+ "corewm/tooltip.h",
+ "corewm/tooltip_aura.cc",
+ "corewm/tooltip_aura.h",
+ "corewm/tooltip_controller.cc",
+ "corewm/tooltip_controller.h",
+ "corewm/tooltip_win.cc",
+ "corewm/tooltip_win.h",
+ "drag_utils_aura.cc",
+ "event_monitor_aura.cc",
+ "event_monitor_aura.h",
+ "metrics_aura.cc",
+ "native_cursor_aura.cc",
+ "touchui/touch_selection_controller_impl.cc",
+ "touchui/touch_selection_controller_impl.h",
+ "touchui/touch_selection_menu_runner_views.cc",
+ "touchui/touch_selection_menu_runner_views.h",
+ "view_constants_aura.cc",
+ "view_constants_aura.h",
+ "views_touch_selection_controller_factory_aura.cc",
+ "widget/native_widget_aura.cc",
+ "widget/native_widget_aura.h",
+ "widget/tooltip_manager_aura.cc",
+ "widget/tooltip_manager_aura.h",
+ "widget/window_reorderer.cc",
+ "widget/window_reorderer.h",
+ ]
deps += [
"//ui/aura",
"//ui/touch_selection",
"//ui/wm",
]
if (!is_chromeos) {
- sources += gypi_values.views_desktop_aura_sources
+ sources += [
+ "widget/desktop_aura/desktop_capture_client.cc",
+ "widget/desktop_aura/desktop_capture_client.h",
+ "widget/desktop_aura/desktop_cursor_loader_updater.h",
+ "widget/desktop_aura/desktop_drop_target_win.cc",
+ "widget/desktop_aura/desktop_drop_target_win.h",
+ "widget/desktop_aura/desktop_event_client.cc",
+ "widget/desktop_aura/desktop_event_client.h",
+ "widget/desktop_aura/desktop_focus_rules.cc",
+ "widget/desktop_aura/desktop_focus_rules.h",
+ "widget/desktop_aura/desktop_native_cursor_manager.cc",
+ "widget/desktop_aura/desktop_native_cursor_manager.h",
+ "widget/desktop_aura/desktop_native_widget_aura.cc",
+ "widget/desktop_aura/desktop_native_widget_aura.h",
+ "widget/desktop_aura/desktop_screen.h",
+ "widget/desktop_aura/desktop_screen_position_client.cc",
+ "widget/desktop_aura/desktop_screen_position_client.h",
+ "widget/desktop_aura/desktop_window_tree_host.h",
+ ]
if (use_atk) {
- sources += gypi_values.views_desktop_aura_x11_sources
+ sources += [
+ "accessibility/native_view_accessibility_auralinux.cc",
+ "accessibility/native_view_accessibility_auralinux.h",
+ "widget/desktop_aura/desktop_drag_drop_client_aurax11.cc",
+ "widget/desktop_aura/desktop_drag_drop_client_aurax11.h",
+ "widget/desktop_aura/desktop_screen_x11.cc",
+ "widget/desktop_aura/desktop_screen_x11.h",
+ "widget/desktop_aura/desktop_window_tree_host_x11.cc",
+ "widget/desktop_aura/desktop_window_tree_host_x11.h",
+ "widget/desktop_aura/x11_desktop_handler.cc",
+ "widget/desktop_aura/x11_desktop_handler.h",
+ "widget/desktop_aura/x11_desktop_handler_observer.h",
+ "widget/desktop_aura/x11_desktop_window_move_client.cc",
+ "widget/desktop_aura/x11_desktop_window_move_client.h",
+ "widget/desktop_aura/x11_move_loop.h",
+ "widget/desktop_aura/x11_move_loop_delegate.h",
+ "widget/desktop_aura/x11_pointer_grab.cc",
+ "widget/desktop_aura/x11_pointer_grab.h",
+ "widget/desktop_aura/x11_topmost_window_finder.cc",
+ "widget/desktop_aura/x11_topmost_window_finder.h",
+ "widget/desktop_aura/x11_whole_screen_move_loop.cc",
+ "widget/desktop_aura/x11_whole_screen_move_loop.h",
+ "widget/desktop_aura/x11_window_event_filter.cc",
+ "widget/desktop_aura/x11_window_event_filter.h",
+ ]
configs += [ "//build/config/linux/atk" ]
} else if (is_win) {
- sources += gypi_values.views_desktop_aura_win_sources
+ sources += [
+ "widget/desktop_aura/desktop_cursor_loader_updater_aurawin.cc",
+ "widget/desktop_aura/desktop_drag_drop_client_win.cc",
+ "widget/desktop_aura/desktop_drag_drop_client_win.h",
+ "widget/desktop_aura/desktop_screen_win.cc",
+ "widget/desktop_aura/desktop_screen_win.h",
+ "widget/desktop_aura/desktop_window_tree_host_win.cc",
+ "widget/desktop_aura/desktop_window_tree_host_win.h",
+ ]
} else if (use_ozone) {
- sources += gypi_values.views_desktop_aura_ozone_sources
+ sources += [
+ "widget/desktop_aura/desktop_factory_ozone.cc",
+ "widget/desktop_aura/desktop_factory_ozone.h",
+ "widget/desktop_aura/desktop_screen_ozone.cc",
+ "widget/desktop_aura/desktop_window_tree_host_ozone.cc",
+ ]
}
if (is_linux) {
- sources += gypi_values.views_desktop_aura_linux_sources
+ sources += [
+ "style/platform_style_linux.cc",
+ "widget/desktop_aura/desktop_cursor_loader_updater_auralinux.cc",
+ "widget/desktop_aura/desktop_cursor_loader_updater_auralinux.h",
+ ]
}
}
}
@@ -150,7 +623,71 @@ component("views") {
static_library("test_support_internal") {
testonly = true
- sources = gypi_values.views_test_support_sources
+ sources = [
+ "animation/test/flood_fill_ink_drop_ripple_test_api.cc",
+ "animation/test/flood_fill_ink_drop_ripple_test_api.h",
+ "animation/test/ink_drop_highlight_test_api.cc",
+ "animation/test/ink_drop_highlight_test_api.h",
+ "animation/test/ink_drop_host_view_test_api.cc",
+ "animation/test/ink_drop_host_view_test_api.h",
+ "animation/test/ink_drop_impl_test_api.cc",
+ "animation/test/ink_drop_impl_test_api.h",
+ "animation/test/ink_drop_ripple_test_api.cc",
+ "animation/test/ink_drop_ripple_test_api.h",
+ "animation/test/ink_drop_utils.cc",
+ "animation/test/square_ink_drop_ripple_test_api.cc",
+ "animation/test/square_ink_drop_ripple_test_api.h",
+ "animation/test/test_ink_drop.cc",
+ "animation/test/test_ink_drop.h",
+ "animation/test/test_ink_drop_animation_observer_helper.h",
+ "animation/test/test_ink_drop_highlight_observer.cc",
+ "animation/test/test_ink_drop_highlight_observer.h",
+ "animation/test/test_ink_drop_host.cc",
+ "animation/test/test_ink_drop_host.h",
+ "animation/test/test_ink_drop_ripple_observer.cc",
+ "animation/test/test_ink_drop_ripple_observer.h",
+ "controls/textfield/textfield_test_api.cc",
+ "controls/textfield/textfield_test_api.h",
+ "test/capture_tracking_view.cc",
+ "test/capture_tracking_view.h",
+ "test/combobox_test_api.cc",
+ "test/combobox_test_api.h",
+ "test/desktop_test_views_delegate.h",
+ "test/desktop_test_views_delegate_mac.mm",
+ "test/event_generator_delegate_mac.h",
+ "test/event_generator_delegate_mac.mm",
+ "test/focus_manager_test.cc",
+ "test/focus_manager_test.h",
+ "test/menu_runner_test_api.cc",
+ "test/menu_runner_test_api.h",
+ "test/menu_test_utils.cc",
+ "test/menu_test_utils.h",
+ "test/native_widget_factory.cc",
+ "test/native_widget_factory.h",
+ "test/scoped_views_test_helper.cc",
+ "test/scoped_views_test_helper.h",
+ "test/slider_test_api.cc",
+ "test/slider_test_api.h",
+ "test/test_views.cc",
+ "test/test_views.h",
+ "test/test_views_delegate.h",
+ "test/test_views_delegate_mac.mm",
+ "test/test_widget_observer.cc",
+ "test/test_widget_observer.h",
+ "test/views_test_base.cc",
+ "test/views_test_base.h",
+ "test/views_test_helper.cc",
+ "test/views_test_helper.h",
+ "test/views_test_helper_mac.h",
+ "test/views_test_helper_mac.mm",
+ "test/widget_test.cc",
+ "test/widget_test.h",
+ "test/widget_test_mac.mm",
+ "test/x11_property_change_waiter.cc",
+ "test/x11_property_change_waiter.h",
+ "views_test_suite.cc",
+ "views_test_suite.h",
+ ]
# External code should depend upon "test_support".
visibility = [ "./*" ]
@@ -186,14 +723,27 @@ static_library("test_support_internal") {
]
if (use_aura) {
- sources += gypi_values.views_test_support_aura_sources
+ sources += [
+ "corewm/tooltip_controller_test_helper.cc",
+ "corewm/tooltip_controller_test_helper.h",
+ "test/desktop_test_views_delegate_aura.cc",
+ "test/test_views_delegate_aura.cc",
+ "test/views_test_helper_aura.cc",
+ "test/views_test_helper_aura.h",
+ "test/widget_test_aura.cc",
+ ]
deps += [
"//ui/aura",
"//ui/aura:test_support",
"//ui/wm",
]
if (use_x11 && !is_chromeos) {
- sources += gypi_values.views_test_support_desktop_aura_x11_sources
+ sources += [
+ "test/desktop_screen_x11_test_api.cc",
+ "test/desktop_screen_x11_test_api.h",
+ "test/ui_controls_factory_desktop_aurax11.cc",
+ "test/ui_controls_factory_desktop_aurax11.h",
+ ]
}
}
if (use_x11) {
@@ -217,10 +767,86 @@ static_library("test_support") {
]
}
-test("views_unittests") {
- sources = gypi_values.views_unittests_sources
+# This target contains the unit tests that are shared between views_unittests
+# and views_mus_unittests.
+source_set("views_unittests_sources") {
+ testonly = true
+ sources = [
+ "accessibility/native_view_accessibility_unittest.cc",
+ "accessibility/native_view_accessibility_win_unittest.cc",
+ "accessible_pane_view_unittest.cc",
+ "animation/bounds_animator_unittest.cc",
+ "animation/flood_fill_ink_drop_ripple_unittest.cc",
+ "animation/ink_drop_highlight_unittest.cc",
+ "animation/ink_drop_host_view_unittest.cc",
+ "animation/ink_drop_impl_unittest.cc",
+ "animation/ink_drop_ripple_unittest.cc",
+ "animation/ink_drop_unittest.cc",
+ "animation/square_ink_drop_ripple_unittest.cc",
+ "border_unittest.cc",
+ "bubble/bubble_border_unittest.cc",
+ "bubble/bubble_dialog_delegate_unittest.cc",
+ "bubble/bubble_frame_view_unittest.cc",
+ "bubble/bubble_window_targeter_unittest.cc",
+ "cocoa/bridged_native_widget_unittest.mm",
+ "cocoa/cocoa_mouse_capture_unittest.mm",
+ "cocoa/drag_drop_client_mac_unittest.mm",
+ "controls/button/blue_button_unittest.cc",
+ "controls/button/custom_button_unittest.cc",
+ "controls/button/image_button_unittest.cc",
+ "controls/button/label_button_unittest.cc",
+ "controls/button/menu_button_unittest.cc",
+ "controls/combobox/combobox_unittest.cc",
+ "controls/label_unittest.cc",
+ "controls/menu/menu_controller_unittest.cc",
+ "controls/menu/menu_item_view_unittest.cc",
+ "controls/menu/menu_model_adapter_unittest.cc",
+ "controls/menu/menu_runner_cocoa_unittest.mm",
+ "controls/menu/menu_runner_unittest.cc",
+ "controls/native/native_view_host_mac_unittest.mm",
+ "controls/native/native_view_host_test_base.cc",
+ "controls/native/native_view_host_test_base.h",
+ "controls/native/native_view_host_unittest.cc",
+ "controls/prefix_selector_unittest.cc",
+ "controls/progress_bar_unittest.cc",
+ "controls/scroll_view_unittest.cc",
+ "controls/scrollbar/scrollbar_unittest.cc",
+ "controls/slider_unittest.cc",
+ "controls/styled_label_unittest.cc",
+ "controls/tabbed_pane/tabbed_pane_unittest.cc",
+ "controls/table/table_utils_unittest.cc",
+ "controls/table/table_view_unittest.cc",
+ "controls/table/test_table_model.cc",
+ "controls/table/test_table_model.h",
+ "controls/textfield/textfield_model_unittest.cc",
+ "controls/tree/tree_view_unittest.cc",
+ "event_monitor_unittest.cc",
+ "focus/focus_manager_unittest.cc",
+ "focus/focus_traversal_unittest.cc",
+ "layout/box_layout_unittest.cc",
+ "layout/grid_layout_unittest.cc",
+ "rect_based_targeting_utils_unittest.cc",
+ "style/mac/dialog_button_border_mac_unittest.cc",
+ "view_model_unittest.cc",
+ "view_model_utils_unittest.cc",
+ "view_targeter_unittest.cc",
+ "view_unittest.cc",
+ "widget/native_widget_mac_accessibility_unittest.mm",
+ "widget/native_widget_mac_unittest.mm",
+ "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",
+ ]
- deps = [
+ configs += [ "//build/config:precompiled_headers" ]
+
+ # Make all deps in this target public so both views_unittests and
+ # views_mus_unittests will get them.
+ public_deps = [
":test_support",
"//base",
"//base:i18n",
@@ -253,7 +879,7 @@ test("views_unittests") {
]
if (is_win) {
- deps += [
+ public_deps += [
"//build/win:default_exe_manifest",
"//third_party/iaccessible2",
"//third_party/wtl",
@@ -270,7 +896,7 @@ test("views_unittests") {
"//build/config/linux:x11",
"//build/config/linux:xext",
]
- deps += [
+ public_deps += [
"//ui/events/devices",
"//ui/events/platform/x11",
"//ui/gfx/x",
@@ -278,23 +904,19 @@ test("views_unittests") {
}
if (use_aura) {
- sources += gypi_values.views_unittests_aura_sources
- deps += [
+ sources += [
+ "accessibility/ax_aura_obj_cache_unittest.cc",
+ "controls/native/native_view_host_aura_unittest.cc",
+ "touchui/touch_selection_menu_runner_views_unittest.cc",
+ "view_unittest_aura.cc",
+ "widget/native_widget_aura_unittest.cc",
+ ]
+ public_deps += [
"//ui/aura",
"//ui/aura:test_support",
"//ui/touch_selection",
"//ui/wm",
]
- if (!is_chromeos) {
- sources += gypi_values.views_unittests_desktop_aura_sources
- if (use_x11) {
- sources += gypi_values.views_unittests_desktop_aurax11_sources
- }
- }
- }
-
- if (!is_chromeos) {
- sources += gypi_values.views_unittests_desktop_sources
}
if (is_mac) {
@@ -304,8 +926,51 @@ test("views_unittests") {
"controls/native/native_view_host_unittest.cc",
"widget/window_reorderer_unittest.cc",
]
- deps += [ "//ui/accelerated_widget_mac" ]
+ public_deps += [ "//ui/accelerated_widget_mac" ]
+ }
+}
+
+test("views_unittests") {
+ sources = [
+ "run_all_unittests_main.cc",
+
+ # EventGenerator doesn't work well with IME in mus so this must not be in
+ # the shared unit test sources.
+ # crbug.com/615033 crbug.com/548407
+ "controls/textfield/textfield_unittest.cc",
+ ]
+
+ if (use_aura) {
+ sources += [
+ # Tooltips. Can not be shared with mus: crbug.com/599558
+ "corewm/tooltip_controller_unittest.cc",
+
+ # Some of the tests need drag-drop support. crbug.com/614037
+ "touchui/touch_selection_controller_impl_unittest.cc",
+ ]
+
+ if (!is_chromeos) {
+ sources += [
+ "widget/desktop_aura/desktop_focus_rules_unittest.cc",
+ "widget/desktop_aura/desktop_native_widget_aura_unittest.cc",
+ ]
+ if (use_x11) {
+ sources += [
+ "widget/desktop_aura/desktop_drag_drop_client_aurax11_unittest.cc",
+ "widget/desktop_aura/desktop_screen_x11_unittest.cc",
+ "widget/desktop_aura/desktop_window_tree_host_x11_unittest.cc",
+ ]
+ }
+ }
}
+
+ if (!is_chromeos) {
+ sources += [ "widget/desktop_widget_unittest.cc" ]
+ }
+
+ deps = [
+ ":views_unittests_sources",
+ ]
}
if (is_mac) {
« no previous file with comments | « .gn ('k') | ui/views/mus/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698