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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: views/views.gyp

Issue 8547015: Revert 110949 - views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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/view_unittest.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
===================================================================
--- views/views.gyp (revision 110952)
+++ views/views.gyp (working copy)
@@ -266,6 +266,49 @@
'view_text_utils.h',
'view_win.cc',
'views_delegate.h',
+ 'widget/aero_tooltip_manager.cc',
+ 'widget/aero_tooltip_manager.h',
+ 'widget/child_window_message_processor.cc',
+ 'widget/child_window_message_processor.h',
+ 'widget/default_theme_provider.cc',
+ '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_gtk.cc',
+ 'widget/tooltip_manager_gtk.h',
+ 'widget/tooltip_manager_views.cc',
+ 'widget/tooltip_manager_views.h',
+ 'widget/tooltip_manager_win.cc',
+ 'widget/tooltip_manager_win.h',
+ 'widget/tooltip_manager.cc',
+ 'widget/tooltip_manager.h',
+ 'widget/monitor_win.cc',
+ 'widget/monitor_win.h',
+ 'widget/native_widget.h',
+ 'widget/native_widget_aura.cc',
+ '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',
+ 'widget/widget.h',
+ 'widget/widget_delegate.cc',
+ 'widget/widget_delegate.h',
+ 'widget/window_manager.cc',
+ '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',
@@ -329,49 +372,6 @@
'../ui/views/touchui/touch_selection_controller.h',
'../ui/views/touchui/touch_selection_controller_impl.cc',
'../ui/views/touchui/touch_selection_controller_impl.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',
@@ -419,6 +419,10 @@
'controls/tree/tree_view.cc',
'controls/tree/tree_view.h',
'drag_utils_win.cc',
+ 'widget/aero_tooltip_manager.cc',
+ 'widget/aero_tooltip_manager.h',
+ 'widget/child_window_message_processor.cc',
+ 'widget/child_window_message_processor.h',
],
},
],
@@ -429,25 +433,25 @@
'../build/linux/system.gyp:xext',
],
'sources!': [
- '../ui/views/accessibility/native_view_accessibility_win.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',
- '../ui/views/widget/native_widget_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',
+ 'widget/aero_tooltip_manager.cc',
+ 'widget/child_window_message_processor.cc',
+ 'widget/child_window_message_processor.h',
+ 'widget/native_widget_win.cc',
],
}],
['touchui==1', {
'defines': ['TOUCH_UI=1'],
'sources/': [
['exclude', '../ui/views/focus/accelerator_handler_gtk.cc'],
- ['exclude', '../ui/views/widget/tooltip_manager_gtk.cc'],
['exclude', 'controls/menu/native_menu_gtk.cc'],
+ ['exclude', 'widget/tooltip_manager_gtk.cc'],
],
}],
['touchui==0', {
@@ -458,9 +462,9 @@
}],
['touchui==0 and use_aura==0', {
'sources!': [
- '../ui/views/widget/tooltip_manager_views.cc',
'controls/menu/native_menu_views.cc',
'controls/menu/native_menu_views.h',
+ 'widget/tooltip_manager_views.cc',
],
}],
['use_ibus==1', {
@@ -535,13 +539,6 @@
'../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',
@@ -555,6 +552,13 @@
'controls/scrollbar/scrollbar_unittest.cc',
'run_all_unittests.cc',
'view_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',
+ 'widget/widget_unittest.cc',
'<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
@@ -602,10 +606,10 @@
],
'sources/': [
['exclude', '../ui/views/focus/focus_manager_unittest.cc'], # TODO(beng):
- ['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', 'widget/native_widget_win_unittest.cc'],
],
}, {
'sources/': [
« no previous file with comments | « views/view_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698