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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: views/views.gyp

Issue 7464027: Wayland support for views. views_desktop on Wayland. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Updated native_widget_wayland.cc to match compositor changes Created 9 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 | « views/view_wayland.cc ('k') | views/widget/native_widget_wayland.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/views.gyp
diff --git a/views/views.gyp b/views/views.gyp
index 0b91db6cbfae9e84973eabb8435086806a8389f4..61ce97bb25149edcf034270fbecd4a666aa12b12 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -86,6 +86,7 @@
'controls/combobox/native_combobox_gtk.h',
'controls/combobox/native_combobox_views.cc',
'controls/combobox/native_combobox_views.h',
+ 'controls/combobox/native_combobox_wayland.cc',
'controls/combobox/native_combobox_win.cc',
'controls/combobox/native_combobox_win.h',
'controls/combobox/native_combobox_wrapper.h',
@@ -104,7 +105,7 @@
'controls/menu/menu_2.h',
'controls/menu/menu_config.cc',
'controls/menu/menu_config.h',
- 'controls/menu/menu_config_gtk.cc',
+ 'controls/menu/menu_config_linux.cc',
'controls/menu/menu_config_win.cc',
'controls/menu/menu_controller.cc',
'controls/menu/menu_controller.h',
@@ -119,7 +120,7 @@
'controls/menu/menu_host_root_view.h',
'controls/menu/menu_item_view.cc',
'controls/menu/menu_item_view.h',
- 'controls/menu/menu_item_view_gtk.cc',
+ 'controls/menu/menu_item_view_linux.cc',
'controls/menu/menu_item_view_win.cc',
'controls/menu/menu_model_adapter.cc',
'controls/menu/menu_model_adapter.h',
@@ -128,7 +129,7 @@
'controls/menu/menu_scroll_view_container.cc',
'controls/menu/menu_scroll_view_container.h',
'controls/menu/menu_separator.h',
- 'controls/menu/menu_separator_gtk.cc',
+ 'controls/menu/menu_separator_linux.cc',
'controls/menu/menu_separator_win.cc',
'controls/menu/menu_win.cc',
'controls/menu/menu_win.h',
@@ -137,14 +138,14 @@
'controls/menu/native_menu_gtk.h',
'controls/menu/native_menu_host.h',
'controls/menu/native_menu_host_delegate.h',
+ 'controls/menu/native_menu_linux.cc',
+ 'controls/menu/native_menu_linux.h',
'controls/menu/native_menu_win.cc',
'controls/menu/native_menu_win.h',
- 'controls/menu/native_menu_x.cc',
- 'controls/menu/native_menu_x.h',
'controls/menu/nested_dispatcher_gtk.cc',
'controls/menu/nested_dispatcher_gtk.h',
- 'controls/menu/menu_image_util_gtk.cc',
- 'controls/menu/menu_image_util_gtk.h',
+ 'controls/menu/menu_image_util_linux.cc',
+ 'controls/menu/menu_image_util_linux.h',
'controls/menu/submenu_view.cc',
'controls/menu/submenu_view.h',
'controls/menu/view_menu_delegate.h',
@@ -164,6 +165,7 @@
'controls/native/native_view_host_win.h',
'controls/native/native_view_host_views.cc',
'controls/native/native_view_host_views.h',
+ 'controls/native/native_view_host_wayland.cc',
'controls/native/native_view_host_wrapper.h',
'controls/progress_bar.h',
'controls/progress_bar.cc',
@@ -183,6 +185,7 @@
'controls/scrollbar/native_scroll_bar_gtk.h',
'controls/scrollbar/native_scroll_bar_views.cc',
'controls/scrollbar/native_scroll_bar_views.h',
+ 'controls/scrollbar/native_scroll_bar_wayland.cc',
'controls/scrollbar/native_scroll_bar_win.cc',
'controls/scrollbar/native_scroll_bar_win.h',
'controls/scrollbar/native_scroll_bar_wrapper.h',
@@ -225,6 +228,7 @@
'controls/textfield/textfield_views_model.h',
'controls/textfield/native_textfield_gtk.cc',
'controls/textfield/native_textfield_gtk.h',
+ 'controls/textfield/native_textfield_wayland.cc',
'controls/textfield/native_textfield_win.cc',
'controls/textfield/native_textfield_win.h',
'controls/textfield/native_textfield_wrapper.h',
@@ -245,6 +249,7 @@
'events/event.h',
'events/event_aura.cc',
'events/event_gtk.cc',
+ 'events/event_wayland.cc',
'events/event_win.cc',
'events/event_utils_win.cc',
'events/event_utils_win.h',
@@ -253,6 +258,7 @@
'focus/accelerator_handler_aura.cc',
'focus/accelerator_handler_gtk.cc',
'focus/accelerator_handler_touch.cc',
+ 'focus/accelerator_handler_wayland.cc',
'focus/accelerator_handler_win.cc',
'focus/external_focus_tracker.cc',
'focus/external_focus_tracker.h',
@@ -276,6 +282,8 @@
'ime/input_method_gtk.h',
'ime/input_method_ibus.cc',
'ime/input_method_ibus.h',
+ 'ime/input_method_wayland.cc',
+ 'ime/input_method_wayland.h',
'ime/input_method_win.cc',
'ime/input_method_win.h',
'ime/mock_input_method.cc',
@@ -299,6 +307,7 @@
'metrics.cc',
'metrics.h',
'metrics_gtk.cc',
+ 'metrics_wayland.cc',
'metrics_win.cc',
'mouse_watcher.cc',
'mouse_watcher.h',
@@ -325,6 +334,7 @@
'view_gtk.cc',
'view_text_utils.cc',
'view_text_utils.h',
+ 'view_wayland.cc',
'view_win.cc',
'views_delegate.h',
'widget/aero_tooltip_manager.cc',
@@ -364,6 +374,8 @@
'widget/native_widget_private.h',
'widget/native_widget_gtk.cc',
'widget/native_widget_gtk.h',
+ 'widget/native_widget_wayland.cc',
+ 'widget/native_widget_wayland.h',
'widget/native_widget_view.cc',
'widget/native_widget_view.h',
'widget/native_widget_views.cc',
@@ -396,6 +408,22 @@
'<(DEPTH)/third_party/wtl/include',
],
'conditions': [
+ ['use_wayland == 1', {
+ 'dependencies': [
+ '../ui/wayland/wayland.gyp:wayland',
+ ],
+ 'sources/': [
+ ['exclude', '_(gtk|x)\\.cc$'],
+ ['exclude', '/(gtk|x)_[^/]*\\.cc$'],
+ ['exclude', 'focus/accelerator_handler_touch.cc'],
+ ['exclude', 'touchui/touch_factory.cc'],
+ ['exclude', 'touchui/touch_factory.h'],
+ ['include', 'controls/menu/native_menu_linux.cc'],
+ ['include', 'controls/menu/native_menu_linux.h'],
+ ['include', 'drag_utils_gtk.cc'],
+ ['include', 'widget/tooltip_manager_views.cc'],
+ ],
+ }],
['use_aura==1', {
'dependencies': [
'../aura/aura.gyp:aura',
@@ -448,8 +476,8 @@
}],
['touchui==0', {
'sources!': [
- 'controls/menu/native_menu_x.cc',
- 'controls/menu/native_menu_x.h',
+ 'controls/menu/native_menu_linux.cc',
+ 'controls/menu/native_menu_linux.h',
'widget/tooltip_manager_views.cc',
'touchui/touch_selection_controller_impl.cc',
'touchui/touch_selection_controller_impl.h',
« no previous file with comments | « views/view_wayland.cc ('k') | views/widget/native_widget_wayland.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698