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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: views/views.gyp

Issue 8588064: views: Move bubble, events, focus and layout 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/layout/layout_manager.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 d3e98b3a9b8bc32de02e06dbb44fe2e8c32bdf6d..6a183c1454b00c58323aa4abedea5c1be0013523 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -61,14 +61,6 @@
'background.h',
'border.cc',
'border.h',
- 'bubble/bubble_border.cc',
- 'bubble/bubble_border.h',
- 'bubble/border_contents_view.cc',
- 'bubble/border_contents_view.h',
- 'bubble/bubble_delegate.cc',
- 'bubble/bubble_delegate.h',
- 'bubble/bubble_frame_view.cc',
- 'bubble/bubble_frame_view.h',
'context_menu_controller.h',
'controls/button/button.cc',
'controls/button/button.h',
@@ -259,40 +251,6 @@
'drag_utils_aura.cc',
'drag_utils_gtk.cc',
'drag_utils_win.cc',
- 'events/event.cc',
- 'events/event.h',
- 'events/event_aura.cc',
- 'events/event_gtk.cc',
- 'events/event_wayland.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_touch.cc',
- 'focus/accelerator_handler_wayland.cc',
- 'focus/accelerator_handler_win.cc',
- 'focus/external_focus_tracker.cc',
- 'focus/external_focus_tracker.h',
- 'focus/focus_manager.cc',
- 'focus/focus_manager.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',
'metrics.cc',
'metrics.h',
'metrics_aura.cc',
@@ -370,10 +328,43 @@
'widget/widget_delegate.h',
'widget/window_manager.cc',
'widget/window_manager.h',
- '../ui/views/animation/bounds_animator.cc',
- '../ui/views/animation/bounds_animator.h',
'../ui/views/accessibility/native_view_accessibility_win.cc',
'../ui/views/accessibility/native_view_accessibility_win.h',
+ '../ui/views/animation/bounds_animator.cc',
+ '../ui/views/animation/bounds_animator.h',
+ '../ui/views/bubble/border_contents_view.cc',
+ '../ui/views/bubble/border_contents_view.h',
+ '../ui/views/bubble/bubble_border.cc',
+ '../ui/views/bubble/bubble_border.h',
+ '../ui/views/bubble/bubble_delegate.cc',
+ '../ui/views/bubble/bubble_delegate.h',
+ '../ui/views/bubble/bubble_frame_view.cc',
+ '../ui/views/bubble/bubble_frame_view.h',
+ '../ui/views/events/event.cc',
+ '../ui/views/events/event.h',
+ '../ui/views/events/event_aura.cc',
+ '../ui/views/events/event_gtk.cc',
+ '../ui/views/events/event_wayland.cc',
+ '../ui/views/events/event_win.cc',
+ '../ui/views/events/event_x.cc',
+ '../ui/views/focus/accelerator_handler.h',
+ '../ui/views/focus/accelerator_handler_aura.cc',
+ '../ui/views/focus/accelerator_handler_gtk.cc',
+ '../ui/views/focus/accelerator_handler_touch.cc',
+ '../ui/views/focus/accelerator_handler_wayland.cc',
+ '../ui/views/focus/accelerator_handler_win.cc',
+ '../ui/views/focus/external_focus_tracker.cc',
+ '../ui/views/focus/external_focus_tracker.h',
+ '../ui/views/focus/focus_manager.cc',
+ '../ui/views/focus/focus_manager.h',
+ '../ui/views/focus/focus_manager_factory.cc',
+ '../ui/views/focus/focus_manager_factory.h',
+ '../ui/views/focus/focus_search.cc',
+ '../ui/views/focus/focus_search.h',
+ '../ui/views/focus/view_storage.cc',
+ '../ui/views/focus/view_storage.h',
+ '../ui/views/focus/widget_focus_manager.cc',
+ '../ui/views/focus/widget_focus_manager.h',
'../ui/views/ime/input_method_base.cc',
'../ui/views/ime/input_method_base.h',
'../ui/views/ime/input_method_delegate.h',
@@ -390,6 +381,15 @@
'../ui/views/ime/mock_input_method.h',
'../ui/views/ime/text_input_type_tracker.cc',
'../ui/views/ime/text_input_type_tracker.h',
+ '../ui/views/layout/box_layout.cc',
+ '../ui/views/layout/box_layout.h',
+ '../ui/views/layout/fill_layout.cc',
+ '../ui/views/layout/fill_layout.h',
+ '../ui/views/layout/grid_layout.cc',
+ '../ui/views/layout/grid_layout.h',
+ '../ui/views/layout/layout_constants.h',
+ '../ui/views/layout/layout_manager.cc',
+ '../ui/views/layout/layout_manager.h',
'../ui/views/touchui/gesture_manager.cc',
'../ui/views/touchui/gesture_manager.h',
'../ui/views/touchui/touch_selection_controller.cc',
@@ -423,7 +423,7 @@
'sources/': [
['exclude', '_(gtk|x)\\.cc$'],
['exclude', '/(gtk|x)_[^/]*\\.cc$'],
- ['exclude', 'focus/accelerator_handler_touch.cc'],
+ ['exclude', '../ui/views/focus/accelerator_handler_touch.cc'],
['include', 'controls/menu/native_menu_views.cc'],
['include', 'controls/menu/native_menu_views.h'],
['include', 'drag_utils_gtk.cc'],
@@ -437,7 +437,7 @@
['exclude', 'controls/menu/menu_2.*'],
],
'sources!': [
- 'drag_utils_win.cc',
+ '../ui/views/focus/accelerator_handler_touch.cc',
'controls/menu/menu_config_linux.cc',
'controls/menu/menu_item_view_linux.cc',
'controls/menu/menu_separator_linux.cc',
@@ -457,7 +457,7 @@
'controls/table/table_view_observer.h',
'controls/tree/tree_view.cc',
'controls/tree/tree_view.h',
- 'focus/accelerator_handler_touch.cc',
+ 'drag_utils_win.cc',
'widget/aero_tooltip_manager.cc',
'widget/aero_tooltip_manager.h',
'widget/child_window_message_processor.cc',
@@ -472,13 +472,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',
- 'events/event_win.cc',
'widget/aero_tooltip_manager.cc',
'widget/child_window_message_processor.cc',
'widget/child_window_message_processor.h',
@@ -488,7 +488,7 @@
['touchui==1', {
'defines': ['TOUCH_UI=1'],
'sources/': [
- ['exclude', 'focus/accelerator_handler_gtk.cc'],
+ ['exclude', '../ui/views/focus/accelerator_handler_gtk.cc'],
['exclude', 'controls/menu/native_menu_gtk.cc'],
['exclude', 'widget/tooltip_manager_gtk.cc'],
],
@@ -531,7 +531,7 @@
}],
['use_x11==0', {
'sources!': [
- 'events/event_x.cc',
+ '../ui/views/events/event_x.cc',
],
}],
],
@@ -566,14 +566,19 @@
],
'sources': [
'../ui/views/animation/bounds_animator_unittest.cc',
+ '../ui/views/bubble/bubble_delegate_unittest.cc',
+ '../ui/views/bubble/bubble_frame_view_unittest.cc',
+ '../ui/views/events/event_unittest.cc',
+ '../ui/views/focus/accelerator_handler_gtk_unittest.cc',
+ '../ui/views/focus/focus_manager_unittest.cc',
+ '../ui/views/layout/box_layout_unittest.cc',
+ '../ui/views/layout/grid_layout_unittest.cc',
'../ui/views/touchui/touch_selection_controller_impl_unittest.cc',
'../ui/views/test/test_views_delegate.cc',
'../ui/views/test/test_views_delegate.h',
'../ui/views/test/views_test_base.cc',
'../ui/views/test/views_test_base.h',
'accessible_pane_view_unittest.cc',
- 'bubble/bubble_delegate_unittest.cc',
- 'bubble/bubble_frame_view_unittest.cc',
'controls/label_unittest.cc',
'controls/progress_bar_unittest.cc',
'controls/single_split_view_unittest.cc',
@@ -584,11 +589,6 @@
'controls/textfield/native_textfield_views_unittest.cc',
'controls/textfield/textfield_views_model_unittest.cc',
'controls/scrollbar/scrollbar_unittest.cc',
- 'events/event_unittest.cc',
- 'focus/accelerator_handler_gtk_unittest.cc',
- 'focus/focus_manager_unittest.cc',
- 'layout/grid_layout_unittest.cc',
- 'layout/box_layout_unittest.cc',
'run_all_unittests.cc',
'view_unittest.cc',
'widget/native_widget_test_utils.h',
@@ -616,7 +616,7 @@
}],
[ 'touchui==1', {
'sources!': [
- 'focus/accelerator_handler_gtk_unittest.cc',
+ '../ui/views/focus/accelerator_handler_gtk_unittest.cc',
'controls/table/table_view_unittest.cc',
'controls/tabbed_pane/tabbed_pane_unittest.cc'
],
@@ -644,11 +644,11 @@
'../ui/aura/aura.gyp:test_support_aura',
],
'sources/': [
- ['exclude', 'focus/focus_manager_unittest.cc'], # TODO(beng):
- ['exclude', 'widget/native_widget_win_unittest.cc'],
+ ['exclude', '../ui/views/focus/focus_manager_unittest.cc'], # TODO(beng):
['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/layout/layout_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698