| Index: views/views.gyp
|
| diff --git a/views/views.gyp b/views/views.gyp
|
| index ce53e674ddf4d121c56359d90fe22dce2477fb2f..52b39c1aa317a69e5ea37c6ee42351caf4866076 100644
|
| --- a/views/views.gyp
|
| +++ b/views/views.gyp
|
| @@ -266,49 +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/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',
|
| @@ -419,10 +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',
|
| + '../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',
|
| ],
|
| },
|
| ],
|
| @@ -440,10 +440,10 @@
|
| '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',
|
| + '../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',
|
| ],
|
| }],
|
| ['touchui==1', {
|
| @@ -451,7 +451,7 @@
|
| 'sources/': [
|
| ['exclude', '../ui/views/focus/accelerator_handler_gtk.cc'],
|
| ['exclude', 'controls/menu/native_menu_gtk.cc'],
|
| - ['exclude', 'widget/tooltip_manager_gtk.cc'],
|
| + ['exclude', '../ui/views/widget/tooltip_manager_gtk.cc'],
|
| ],
|
| }],
|
| ['touchui==0', {
|
| @@ -464,7 +464,7 @@
|
| 'sources!': [
|
| 'controls/menu/native_menu_views.cc',
|
| 'controls/menu/native_menu_views.h',
|
| - 'widget/tooltip_manager_views.cc',
|
| + '../ui/views/widget/tooltip_manager_views.cc',
|
| ],
|
| }],
|
| ['use_ibus==1', {
|
| @@ -552,13 +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',
|
| + '../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',
|
| @@ -609,7 +609,7 @@
|
| ['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'],
|
| + ['exclude', '../ui/views/widget/native_widget_win_unittest.cc'],
|
| ],
|
| }, {
|
| 'sources/': [
|
|
|