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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/views/views.gyp

Issue 9728002: Removing deprecated GTK-Views code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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 | « ui/views/view_gtk.cc ('k') | ui/views/widget/drop_target_gtk.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/views.gyp
diff --git a/ui/views/views.gyp b/ui/views/views.gyp
index b53012fe59d78fc4c229acb02d9a3da876a7ea07..5823fbca9689e161cf85e75f71b1ab68494d6223 100644
--- a/ui/views/views.gyp
+++ b/ui/views/views.gyp
@@ -15,7 +15,6 @@
]}],
['use_aura==1', {
'sources/': [ ['exclude', '_win\\.(h|cc)$'],
- ['exclude', '_gtk\\.(h|cc)$'],
['exclude', '_x\\.(h|cc)$'] ],
'dependencies': [ '../aura/aura.gyp:aura', ],
}],
@@ -88,8 +87,6 @@
'controls/combobox/combobox.cc',
'controls/combobox/combobox.h',
'controls/combobox/combobox_listener.h',
- 'controls/combobox/native_combobox_gtk.cc',
- 'controls/combobox/native_combobox_gtk.h',
'controls/combobox/native_combobox_views.cc',
'controls/combobox/native_combobox_views.h',
'controls/combobox/native_combobox_win.cc',
@@ -119,8 +116,6 @@
'controls/menu/menu_controller_delegate.h',
'controls/menu/menu_delegate.cc',
'controls/menu/menu_delegate.h',
- 'controls/menu/menu_gtk.cc',
- 'controls/menu/menu_gtk.h',
'controls/menu/menu_host.cc',
'controls/menu/menu_host.h',
'controls/menu/menu_host_root_view.cc',
@@ -143,14 +138,10 @@
'controls/menu/menu_win.cc',
'controls/menu/menu_win.h',
'controls/menu/menu_wrapper.h',
- 'controls/menu/native_menu_gtk.cc',
- 'controls/menu/native_menu_gtk.h',
'controls/menu/native_menu_host.h',
'controls/menu/native_menu_host_delegate.h',
'controls/menu/native_menu_win.cc',
'controls/menu/native_menu_win.h',
- 'controls/menu/nested_dispatcher_gtk.cc',
- 'controls/menu/nested_dispatcher_gtk.h',
'controls/menu/menu_image_util.cc',
'controls/menu/menu_image_util.h',
'controls/menu/submenu_view.cc',
@@ -159,16 +150,12 @@
'controls/message_box_view.h',
'controls/native_control.cc',
'controls/native_control.h',
- 'controls/native_control_gtk.cc',
- 'controls/native_control_gtk.h',
'controls/native_control_win.cc',
'controls/native_control_win.h',
'controls/native/native_view_host.cc',
'controls/native/native_view_host.h',
'controls/native/native_view_host_aura.cc',
'controls/native/native_view_host_aura.h',
- 'controls/native/native_view_host_gtk.cc',
- 'controls/native/native_view_host_gtk.h',
'controls/native/native_view_host_win.cc',
'controls/native/native_view_host_win.h',
'controls/progress_bar.cc',
@@ -186,8 +173,6 @@
'controls/scrollbar/base_scroll_bar_thumb.h',
'controls/scrollbar/bitmap_scroll_bar.cc',
'controls/scrollbar/bitmap_scroll_bar.h',
- 'controls/scrollbar/native_scroll_bar_gtk.cc',
- '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_win.cc',
@@ -204,8 +189,6 @@
'controls/single_split_view_listener.h',
'controls/slider.cc',
'controls/slider.h',
- 'controls/tabbed_pane/native_tabbed_pane_gtk.cc',
- 'controls/tabbed_pane/native_tabbed_pane_gtk.h',
'controls/tabbed_pane/native_tabbed_pane_views.cc',
'controls/tabbed_pane/native_tabbed_pane_views.h',
'controls/tabbed_pane/native_tabbed_pane_win.cc',
@@ -226,12 +209,6 @@
'controls/table/table_view_views.h',
'controls/table/table_view_win.cc',
'controls/table/table_view_win.h',
- 'controls/textfield/gtk_views_entry.cc',
- 'controls/textfield/gtk_views_entry.h',
- 'controls/textfield/gtk_views_textview.cc',
- 'controls/textfield/gtk_views_textview.h',
- 'controls/textfield/native_textfield_gtk.cc',
- 'controls/textfield/native_textfield_gtk.h',
'controls/textfield/native_textfield_views.cc',
'controls/textfield/native_textfield_views.h',
'controls/textfield/native_textfield_win.cc',
@@ -258,12 +235,10 @@
'events/event.cc',
'events/event.h',
'events/event_aura.cc',
- 'events/event_gtk.cc',
'events/event_win.cc',
'events/event_x.cc',
'focus/accelerator_handler.h',
'focus/accelerator_handler_aura.cc',
- 'focus/accelerator_handler_gtk.cc',
'focus/accelerator_handler_win.cc',
'focus/external_focus_tracker.cc',
'focus/external_focus_tracker.h',
@@ -282,8 +257,6 @@
'ime/input_method_bridge.cc',
'ime/input_method_bridge.h',
'ime/input_method_delegate.h',
- 'ime/input_method_gtk.cc',
- 'ime/input_method_gtk.h',
'ime/input_method.h',
'ime/input_method_win.cc',
'ime/input_method_win.h',
@@ -303,7 +276,6 @@
'metrics.cc',
'metrics.h',
'metrics_aura.cc',
- 'metrics_gtk.cc',
'metrics_win.cc',
'mouse_watcher.cc',
'mouse_watcher.h',
@@ -327,7 +299,6 @@
'view_constants.cc',
'view_constants.h',
'view_aura.cc',
- 'view_gtk.cc',
'view_text_utils.cc',
'view_text_utils.h',
'view_win.cc',
@@ -340,20 +311,12 @@
'widget/default_theme_provider.h',
'widget/drop_helper.cc',
'widget/drop_helper.h',
- 'widget/drop_target_gtk.cc',
- 'widget/drop_target_gtk.h',
'widget/drop_target_win.cc',
'widget/drop_target_win.h',
- 'widget/gtk_views_fixed.cc',
- 'widget/gtk_views_fixed.h',
- 'widget/gtk_views_window.cc',
- 'widget/gtk_views_window.h',
'widget/root_view.cc',
'widget/root_view.h',
'widget/tooltip_manager_aura.cc',
'widget/tooltip_manager_aura.h',
- 'widget/tooltip_manager_gtk.cc',
- 'widget/tooltip_manager_gtk.h',
'widget/tooltip_manager_win.cc',
'widget/tooltip_manager_win.h',
'widget/tooltip_manager.cc',
@@ -365,8 +328,6 @@
'widget/native_widget_aura.h',
'widget/native_widget_delegate.h',
'widget/native_widget_private.h',
- 'widget/native_widget_gtk.cc',
- 'widget/native_widget_gtk.h',
'widget/native_widget_win.cc',
'widget/native_widget_win.h',
'widget/widget.cc',
@@ -397,8 +358,8 @@
'conditions': [
['use_aura==1', {
'sources/': [
- ['exclude', '_(gtk|x)\\.cc$'],
- ['exclude', '/(gtk|x)_[^/]*\\.cc$'],
+ ['exclude', '_x\\.cc$'],
+ ['exclude', '/x_[^/]*\\.cc$'],
['exclude', 'controls/menu/menu_2.*'],
],
'sources!': [
@@ -427,25 +388,6 @@
}],
],
}],
- ['toolkit_uses_gtk == 1', {
- 'dependencies': [
- '../../build/linux/system.gyp:gtk',
- '../../build/linux/system.gyp:x11',
- '../../build/linux/system.gyp:xext',
- ],
- 'sources!': [
- 'accessibility/native_view_accessibility_win.cc',
- 'controls/native_control.cc',
- 'controls/scrollbar/bitmap_scroll_bar.cc',
- 'controls/table/group_table_model.cc',
- 'controls/tree/tree_view.h',
- 'events/event_win.cc',
- 'widget/aero_tooltip_manager.cc',
- 'widget/child_window_message_processor.cc',
- 'widget/child_window_message_processor.h',
- 'widget/native_widget_win.cc',
- ],
- }],
['use_aura==0', {
'sources!': [
'controls/tabbed_pane/native_tabbed_pane_views.cc',
@@ -528,7 +470,6 @@
'controls/textfield/textfield_views_model_unittest.cc',
'controls/tree/tree_view_views_unittest.cc',
'events/event_unittest.cc',
- 'focus/accelerator_handler_gtk_unittest.cc',
'focus/focus_manager_test.h',
'focus/focus_manager_test.cc',
'focus/focus_manager_unittest.cc',
@@ -545,7 +486,6 @@
'widget/native_widget_aura_unittest.cc',
'widget/native_widget_test_utils.h',
'widget/native_widget_test_utils_aura.cc',
- 'widget/native_widget_test_utils_gtk.cc',
'widget/native_widget_test_utils_win.cc',
'widget/native_widget_unittest.cc',
'widget/native_widget_win_unittest.cc',
@@ -557,21 +497,6 @@
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',
],
'conditions': [
- ['toolkit_uses_gtk == 1', {
- 'dependencies': [
- '../../build/linux/system.gyp:gtk',
- ],
- 'conditions': [
- ['linux_use_tcmalloc==1', {
- 'dependencies': [
- '../../base/allocator/allocator.gyp:allocator',
- ],
- }],
- ],
- 'sources/': [
- ['exclude', 'controls/table/table_view_unittest.cc'],
- ],
- }],
['OS=="win"', {
'link_settings': {
'libraries': [
@@ -714,19 +639,6 @@
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',
],
'conditions': [
- ['toolkit_uses_gtk == 1', {
- 'dependencies': [
- '../../build/linux/system.gyp:gtk',
- ],
- 'conditions': [
- ['linux_use_tcmalloc==1', {
- 'dependencies': [
- '../../base/allocator/allocator.gyp:allocator',
- ],
- }],
- ],
- },
- ],
['OS=="win"', {
'link_settings': {
'libraries': [
« no previous file with comments | « ui/views/view_gtk.cc ('k') | ui/views/widget/drop_target_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698