| Index: views/views.gyp
|
| diff --git a/views/views.gyp b/views/views.gyp
|
| index 841adb24e47f187d0ba125af2ae7ebd1101db8c0..d87c96183f1898f19f40f6948d2130e560ab4276 100644
|
| --- a/views/views.gyp
|
| +++ b/views/views.gyp
|
| @@ -52,32 +52,6 @@
|
| 'border.cc',
|
| 'border.h',
|
| 'context_menu_controller.h',
|
| - 'controls/focusable_border.cc',
|
| - 'controls/focusable_border.h',
|
| - 'controls/image_view.cc',
|
| - 'controls/image_view.h',
|
| - 'controls/message_box_view.cc',
|
| - '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/progress_bar.h',
|
| - 'controls/progress_bar.cc',
|
| - 'controls/resize_area.cc',
|
| - 'controls/resize_area.h',
|
| - 'controls/resize_area_delegate.h',
|
| - 'controls/scroll_view.cc',
|
| - 'controls/scroll_view.h',
|
| - 'controls/separator.cc',
|
| - 'controls/separator.h',
|
| - 'controls/single_split_view.cc',
|
| - 'controls/single_split_view.h',
|
| - 'controls/single_split_view_listener.h',
|
| - 'controls/throbber.cc',
|
| - 'controls/throbber.h',
|
| #'debug_utils.cc',
|
| #'debug_utils.h',
|
| 'drag_controller.h',
|
| @@ -150,6 +124,10 @@
|
| '../ui/views/controls/combobox/native_combobox_win.cc',
|
| '../ui/views/controls/combobox/native_combobox_win.h',
|
| '../ui/views/controls/combobox/native_combobox_wrapper.h',
|
| + '../ui/views/controls/focusable_border.cc',
|
| + '../ui/views/controls/focusable_border.h',
|
| + '../ui/views/controls/image_view.cc',
|
| + '../ui/views/controls/image_view.h',
|
| '../ui/views/controls/label.cc',
|
| '../ui/views/controls/label.h',
|
| '../ui/views/controls/link.cc',
|
| @@ -209,6 +187,14 @@
|
| '../ui/views/controls/menu/submenu_view.cc',
|
| '../ui/views/controls/menu/submenu_view.h',
|
| '../ui/views/controls/menu/view_menu_delegate.h',
|
| + '../ui/views/controls/message_box_view.cc',
|
| + '../ui/views/controls/message_box_view.h',
|
| + '../ui/views/controls/native_control.cc',
|
| + '../ui/views/controls/native_control.h',
|
| + '../ui/views/controls/native_control_gtk.cc',
|
| + '../ui/views/controls/native_control_gtk.h',
|
| + '../ui/views/controls/native_control_win.cc',
|
| + '../ui/views/controls/native_control_win.h',
|
| '../ui/views/controls/native/native_view_host.cc',
|
| '../ui/views/controls/native/native_view_host.h',
|
| '../ui/views/controls/native/native_view_host_aura.cc',
|
| @@ -217,6 +203,13 @@
|
| '../ui/views/controls/native/native_view_host_gtk.h',
|
| '../ui/views/controls/native/native_view_host_win.cc',
|
| '../ui/views/controls/native/native_view_host_win.h',
|
| + '../ui/views/controls/progress_bar.cc',
|
| + '../ui/views/controls/progress_bar.h',
|
| + '../ui/views/controls/resize_area.cc',
|
| + '../ui/views/controls/resize_area.h',
|
| + '../ui/views/controls/resize_area_delegate.h',
|
| + '../ui/views/controls/scroll_view.cc',
|
| + '../ui/views/controls/scroll_view.h',
|
| '../ui/views/controls/scrollbar/base_scroll_bar.cc',
|
| '../ui/views/controls/scrollbar/base_scroll_bar.h',
|
| '../ui/views/controls/scrollbar/base_scroll_bar_button.cc',
|
| @@ -236,6 +229,11 @@
|
| '../ui/views/controls/scrollbar/native_scroll_bar.h',
|
| '../ui/views/controls/scrollbar/scroll_bar.cc',
|
| '../ui/views/controls/scrollbar/scroll_bar.h',
|
| + '../ui/views/controls/separator.cc',
|
| + '../ui/views/controls/separator.h',
|
| + '../ui/views/controls/single_split_view.cc',
|
| + '../ui/views/controls/single_split_view.h',
|
| + '../ui/views/controls/single_split_view_listener.h',
|
| '../ui/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc',
|
| '../ui/views/controls/tabbed_pane/native_tabbed_pane_gtk.h',
|
| '../ui/views/controls/tabbed_pane/native_tabbed_pane_win.cc',
|
| @@ -272,6 +270,8 @@
|
| '../ui/views/controls/textfield/textfield_controller.h',
|
| '../ui/views/controls/textfield/textfield_views_model.cc',
|
| '../ui/views/controls/textfield/textfield_views_model.h',
|
| + '../ui/views/controls/throbber.cc',
|
| + '../ui/views/controls/throbber.h',
|
| '../ui/views/controls/tree/tree_view.cc',
|
| '../ui/views/controls/tree/tree_view.h',
|
| '../ui/views/events/event.cc',
|
| @@ -393,12 +393,12 @@
|
| ['exclude', '../ui/views/controls/menu/menu_2.*'],
|
| ],
|
| 'sources!': [
|
| - 'controls/native_control.cc',
|
| - 'controls/native_control.h',
|
| 'drag_utils_win.cc',
|
| '../ui/views/controls/menu/menu_config_linux.cc',
|
| '../ui/views/controls/menu/menu_item_view_linux.cc',
|
| '../ui/views/controls/menu/menu_separator_linux.cc',
|
| + '../ui/views/controls/native_control.cc',
|
| + '../ui/views/controls/native_control.h',
|
| '../ui/views/controls/scrollbar/bitmap_scroll_bar.cc',
|
| '../ui/views/controls/scrollbar/bitmap_scroll_bar.h',
|
| '../ui/views/controls/tabbed_pane/tabbed_pane.cc',
|
| @@ -427,8 +427,8 @@
|
| '../build/linux/system.gyp:xext',
|
| ],
|
| 'sources!': [
|
| - 'controls/native_control.cc',
|
| '../ui/views/accessibility/native_view_accessibility_win.cc',
|
| + '../ui/views/controls/native_control.cc',
|
| '../ui/views/controls/scrollbar/bitmap_scroll_bar.cc',
|
| '../ui/views/controls/table/group_table_view.cc',
|
| '../ui/views/controls/table/table_view.cc',
|
| @@ -512,7 +512,9 @@
|
| '../ui/views/controls/combobox/native_combobox_views_unittest.cc',
|
| '../ui/views/controls/label_unittest.cc',
|
| '../ui/views/controls/menu/menu_model_adapter_unittest.cc',
|
| + '../ui/views/controls/progress_bar_unittest.cc',
|
| '../ui/views/controls/scrollbar/scrollbar_unittest.cc',
|
| + '../ui/views/controls/single_split_view_unittest.cc',
|
| '../ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc',
|
| '../ui/views/controls/table/table_view_unittest.cc',
|
| '../ui/views/controls/textfield/native_textfield_views_unittest.cc',
|
| @@ -538,8 +540,6 @@
|
| '../ui/views/widget/native_widget_win_unittest.cc',
|
| '../ui/views/widget/widget_unittest.cc',
|
| 'accessible_pane_view_unittest.cc',
|
| - 'controls/progress_bar_unittest.cc',
|
| - 'controls/single_split_view_unittest.cc',
|
| 'run_all_unittests.cc',
|
| 'view_unittest.cc',
|
|
|
|
|