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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: views/views.gyp

Issue 8655001: views: Move table and tree directories to ui/views/controls/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: exclude native_widget_win_unittest too Created 9 years, 1 month 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/controls/tree/tree_view.cc ('k') | no next file » | 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 ffbe101724b74eed0bd4aea76966e59a307d773d..088388f520ae2578fd250d5489319561f4755a7b 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -196,18 +196,6 @@
'controls/tabbed_pane/tabbed_pane.cc',
'controls/tabbed_pane/tabbed_pane.h',
'controls/tabbed_pane/tabbed_pane_listener.h',
- 'controls/table/native_table_wrapper.h',
- 'controls/table/native_table_gtk.cc',
- 'controls/table/native_table_gtk.h',
- 'controls/table/native_table_win.cc',
- 'controls/table/native_table_win.h',
- 'controls/table/group_table_view.cc',
- 'controls/table/group_table_view.h',
- 'controls/table/table_view.cc',
- 'controls/table/table_view.h',
- 'controls/table/table_view2.cc',
- 'controls/table/table_view2.h',
- 'controls/table/table_view_observer.h',
'controls/textfield/gtk_views_entry.cc',
'controls/textfield/gtk_views_entry.h',
'controls/textfield/gtk_views_textview.cc',
@@ -226,8 +214,6 @@
'controls/textfield/native_textfield_views.h',
'controls/throbber.cc',
'controls/throbber.h',
- 'controls/tree/tree_view.cc',
- 'controls/tree/tree_view.h',
#'debug_utils.cc',
#'debug_utils.h',
'drag_controller.h',
@@ -262,49 +248,6 @@
'view_text_utils.h',
'view_win.cc',
'views_delegate.h',
- '../ui/views/widget/aero_tooltip_manager.cc',
- '../ui/views/widget/aero_tooltip_manager.h',
- '../ui/views/widget/child_window_message_processor.cc',
- '../ui/views/widget/child_window_message_processor.h',
- '../ui/views/widget/default_theme_provider.cc',
- '../ui/views/widget/default_theme_provider.h',
- '../ui/views/widget/drop_helper.cc',
- '../ui/views/widget/drop_helper.h',
- '../ui/views/widget/drop_target_gtk.cc',
- '../ui/views/widget/drop_target_gtk.h',
- '../ui/views/widget/drop_target_win.cc',
- '../ui/views/widget/drop_target_win.h',
- '../ui/views/widget/gtk_views_fixed.cc',
- '../ui/views/widget/gtk_views_fixed.h',
- '../ui/views/widget/gtk_views_window.cc',
- '../ui/views/widget/gtk_views_window.h',
- '../ui/views/widget/root_view.cc',
- '../ui/views/widget/root_view.h',
- '../ui/views/widget/tooltip_manager_gtk.cc',
- '../ui/views/widget/tooltip_manager_gtk.h',
- '../ui/views/widget/tooltip_manager_views.cc',
- '../ui/views/widget/tooltip_manager_views.h',
- '../ui/views/widget/tooltip_manager_win.cc',
- '../ui/views/widget/tooltip_manager_win.h',
- '../ui/views/widget/tooltip_manager.cc',
- '../ui/views/widget/tooltip_manager.h',
- '../ui/views/widget/monitor_win.cc',
- '../ui/views/widget/monitor_win.h',
- '../ui/views/widget/native_widget.h',
- '../ui/views/widget/native_widget_aura.cc',
- '../ui/views/widget/native_widget_aura.h',
- '../ui/views/widget/native_widget_delegate.h',
- '../ui/views/widget/native_widget_private.h',
- '../ui/views/widget/native_widget_gtk.cc',
- '../ui/views/widget/native_widget_gtk.h',
- '../ui/views/widget/native_widget_win.cc',
- '../ui/views/widget/native_widget_win.h',
- '../ui/views/widget/widget.cc',
- '../ui/views/widget/widget.h',
- '../ui/views/widget/widget_delegate.cc',
- '../ui/views/widget/widget_delegate.h',
- '../ui/views/widget/window_manager.cc',
- '../ui/views/widget/window_manager.h',
'../ui/views/accessibility/native_view_accessibility_win.cc',
'../ui/views/accessibility/native_view_accessibility_win.h',
'../ui/views/animation/bounds_animator.cc',
@@ -317,6 +260,20 @@
'../ui/views/bubble/bubble_delegate.h',
'../ui/views/bubble/bubble_frame_view.cc',
'../ui/views/bubble/bubble_frame_view.h',
+ '../ui/views/controls/table/native_table_wrapper.h',
+ '../ui/views/controls/table/native_table_gtk.cc',
+ '../ui/views/controls/table/native_table_gtk.h',
+ '../ui/views/controls/table/native_table_win.cc',
+ '../ui/views/controls/table/native_table_win.h',
+ '../ui/views/controls/table/group_table_view.cc',
+ '../ui/views/controls/table/group_table_view.h',
+ '../ui/views/controls/table/table_view.cc',
+ '../ui/views/controls/table/table_view.h',
+ '../ui/views/controls/table/table_view2.cc',
+ '../ui/views/controls/table/table_view2.h',
+ '../ui/views/controls/table/table_view_observer.h',
+ '../ui/views/controls/tree/tree_view.cc',
+ '../ui/views/controls/tree/tree_view.h',
'../ui/views/events/event.cc',
'../ui/views/events/event.h',
'../ui/views/events/event_aura.cc',
@@ -366,6 +323,49 @@
'../ui/views/touchui/gesture_manager.h',
'../ui/views/touchui/touch_selection_controller.cc',
'../ui/views/touchui/touch_selection_controller.h',
+ '../ui/views/widget/aero_tooltip_manager.cc',
+ '../ui/views/widget/aero_tooltip_manager.h',
+ '../ui/views/widget/child_window_message_processor.cc',
+ '../ui/views/widget/child_window_message_processor.h',
+ '../ui/views/widget/default_theme_provider.cc',
+ '../ui/views/widget/default_theme_provider.h',
+ '../ui/views/widget/drop_helper.cc',
+ '../ui/views/widget/drop_helper.h',
+ '../ui/views/widget/drop_target_gtk.cc',
+ '../ui/views/widget/drop_target_gtk.h',
+ '../ui/views/widget/drop_target_win.cc',
+ '../ui/views/widget/drop_target_win.h',
+ '../ui/views/widget/gtk_views_fixed.cc',
+ '../ui/views/widget/gtk_views_fixed.h',
+ '../ui/views/widget/gtk_views_window.cc',
+ '../ui/views/widget/gtk_views_window.h',
+ '../ui/views/widget/root_view.cc',
+ '../ui/views/widget/root_view.h',
+ '../ui/views/widget/tooltip_manager_gtk.cc',
+ '../ui/views/widget/tooltip_manager_gtk.h',
+ '../ui/views/widget/tooltip_manager_views.cc',
+ '../ui/views/widget/tooltip_manager_views.h',
+ '../ui/views/widget/tooltip_manager_win.cc',
+ '../ui/views/widget/tooltip_manager_win.h',
+ '../ui/views/widget/tooltip_manager.cc',
+ '../ui/views/widget/tooltip_manager.h',
+ '../ui/views/widget/monitor_win.cc',
+ '../ui/views/widget/monitor_win.h',
+ '../ui/views/widget/native_widget.h',
+ '../ui/views/widget/native_widget_aura.cc',
+ '../ui/views/widget/native_widget_aura.h',
+ '../ui/views/widget/native_widget_delegate.h',
+ '../ui/views/widget/native_widget_private.h',
+ '../ui/views/widget/native_widget_gtk.cc',
+ '../ui/views/widget/native_widget_gtk.h',
+ '../ui/views/widget/native_widget_win.cc',
+ '../ui/views/widget/native_widget_win.h',
+ '../ui/views/widget/widget.cc',
+ '../ui/views/widget/widget.h',
+ '../ui/views/widget/widget_delegate.cc',
+ '../ui/views/widget/widget_delegate.h',
+ '../ui/views/widget/window_manager.cc',
+ '../ui/views/widget/window_manager.h',
'../ui/views/window/client_view.cc',
'../ui/views/window/client_view.h',
'../ui/views/window/custom_frame_view.cc',
@@ -402,17 +402,17 @@
'controls/scrollbar/bitmap_scroll_bar.h',
'controls/tabbed_pane/tabbed_pane.cc',
'controls/tabbed_pane/tabbed_pane.h',
- 'controls/table/group_table_view.cc',
- 'controls/table/group_table_view.h',
- 'controls/table/native_table_wrapper.h',
- 'controls/table/table_view.cc',
- 'controls/table/table_view.h',
- 'controls/table/table_view2.cc',
- 'controls/table/table_view2.h',
- 'controls/table/table_view_observer.h',
- 'controls/tree/tree_view.cc',
- 'controls/tree/tree_view.h',
'drag_utils_win.cc',
+ '../ui/views/controls/table/group_table_view.cc',
+ '../ui/views/controls/table/group_table_view.h',
+ '../ui/views/controls/table/native_table_wrapper.h',
+ '../ui/views/controls/table/table_view.cc',
+ '../ui/views/controls/table/table_view.h',
+ '../ui/views/controls/table/table_view2.cc',
+ '../ui/views/controls/table/table_view2.h',
+ '../ui/views/controls/table/table_view_observer.h',
+ '../ui/views/controls/tree/tree_view.cc',
+ '../ui/views/controls/tree/tree_view.h',
'../ui/views/widget/aero_tooltip_manager.cc',
'../ui/views/widget/aero_tooltip_manager.h',
'../ui/views/widget/child_window_message_processor.cc',
@@ -427,13 +427,13 @@
'../build/linux/system.gyp:xext',
],
'sources!': [
- '../ui/views/events/event_win.cc',
'accessibility/native_view_accessibility_win.cc',
'controls/scrollbar/bitmap_scroll_bar.cc',
'controls/native_control.cc',
- 'controls/table/group_table_view.cc',
- 'controls/table/table_view.cc',
- 'controls/tree/tree_view.cc',
+ '../ui/views/controls/table/group_table_view.cc',
+ '../ui/views/controls/table/table_view.cc',
+ '../ui/views/controls/tree/tree_view.cc',
+ '../ui/views/events/event_win.cc',
'../ui/views/widget/aero_tooltip_manager.cc',
'../ui/views/widget/child_window_message_processor.cc',
'../ui/views/widget/child_window_message_processor.h',
@@ -509,6 +509,7 @@
'../ui/views/animation/bounds_animator_unittest.cc',
'../ui/views/bubble/bubble_delegate_unittest.cc',
'../ui/views/bubble/bubble_frame_view_unittest.cc',
+ '../ui/views/controls/table/table_view_unittest.cc',
'../ui/views/events/event_unittest.cc',
'../ui/views/focus/accelerator_handler_gtk_unittest.cc',
'../ui/views/focus/focus_manager_test.h',
@@ -522,12 +523,18 @@
'../ui/views/test/test_views_delegate.h',
'../ui/views/test/views_test_base.cc',
'../ui/views/test/views_test_base.h',
+ '../ui/views/widget/native_widget_test_utils.h',
+ '../ui/views/widget/native_widget_test_utils_aura.cc',
+ '../ui/views/widget/native_widget_test_utils_gtk.cc',
+ '../ui/views/widget/native_widget_test_utils_win.cc',
+ '../ui/views/widget/native_widget_unittest.cc',
+ '../ui/views/widget/native_widget_win_unittest.cc',
+ '../ui/views/widget/widget_unittest.cc',
'accessible_pane_view_unittest.cc',
'controls/label_unittest.cc',
'controls/progress_bar_unittest.cc',
'controls/single_split_view_unittest.cc',
'controls/tabbed_pane/tabbed_pane_unittest.cc',
- 'controls/table/table_view_unittest.cc',
'controls/combobox/native_combobox_views_unittest.cc',
'controls/menu/menu_model_adapter_unittest.cc',
'controls/textfield/native_textfield_views_unittest.cc',
@@ -535,13 +542,6 @@
'controls/scrollbar/scrollbar_unittest.cc',
'run_all_unittests.cc',
'view_unittest.cc',
- '../ui/views/widget/native_widget_test_utils.h',
- '../ui/views/widget/native_widget_test_utils_aura.cc',
- '../ui/views/widget/native_widget_test_utils_gtk.cc',
- '../ui/views/widget/native_widget_test_utils_win.cc',
- '../ui/views/widget/native_widget_unittest.cc',
- '../ui/views/widget/native_widget_win_unittest.cc',
- '../ui/views/widget/widget_unittest.cc',
'<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
@@ -576,10 +576,10 @@
'../ui/aura/aura.gyp:test_support_aura',
],
'sources/': [
+ ['exclude', '../ui/views/controls/table/table_view_unittest.cc'],
+ ['exclude', '../ui/views/widget/native_widget_win_unittest.cc'],
['exclude', 'controls/combobox/native_combobox_views_unittest.cc'],
- ['exclude', 'controls/table/table_view_unittest.cc'],
['exclude', 'controls/tabbed_pane/tabbed_pane_unittest.cc'],
- ['exclude', '../ui/views/widget/native_widget_win_unittest.cc'],
],
}, {
'sources/': [
« no previous file with comments | « views/controls/tree/tree_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698