views: Move bubble, events, focus and layout to ui/views/.

views/views.gyp

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'variables': {
     'chromium_code': 1,
   },
 
   'target_defaults': {
     'conditions': [
@@ skipping 43 matching lines @@
         'VIEWS_IMPLEMENTATION',
       ],
       'sources': [
         # All .cc, .h under views, except unittests
         'accessible_pane_view.cc',
         'accessible_pane_view.h',
         'background.cc',
         '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',
         'controls/button/button_dropdown.cc',
         'controls/button/button_dropdown.h',
         'controls/button/checkbox.cc',
         'controls/button/checkbox.h',
         'controls/button/custom_button.cc',
         'controls/button/custom_button.h',
         'controls/button/image_button.cc',
@@ skipping 170 matching lines @@
         'controls/tree/tree_view.cc',
         'controls/tree/tree_view.h',
         #'debug_utils.cc',
         #'debug_utils.h',
         'drag_controller.h',
         'drag_utils.cc',
         'drag_utils.h',
         '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',
         'metrics_gtk.cc',
         'metrics_wayland.cc',
         'metrics_win.cc',
         'mouse_watcher.cc',
         'mouse_watcher.h',
         'native_theme_delegate.h',
         'native_theme_painter.cc',
@@ skipping 57 matching lines @@
         'widget/native_widget_views.cc',
         'widget/native_widget_views.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',
         '../ui/views/animation/bounds_animator.h',
-        '../ui/views/accessibility/native_view_accessibility_win.cc',
-        '../ui/views/accessibility/native_view_accessibility_win.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',
         '../ui/views/ime/input_method_gtk.cc',
         '../ui/views/ime/input_method_gtk.h',
         '../ui/views/ime/input_method.h',
         '../ui/views/ime/input_method_ibus.cc',
         '../ui/views/ime/input_method_ibus.h',
         '../ui/views/ime/input_method_wayland.cc',
         '../ui/views/ime/input_method_wayland.h',
         '../ui/views/ime/input_method_win.cc',
         '../ui/views/ime/input_method_win.h',
         '../ui/views/ime/mock_input_method.cc',
         '../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',
         '../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/window/client_view.cc',
         '../ui/views/window/client_view.h',
         '../ui/views/window/custom_frame_view.cc',
         '../ui/views/window/window/custom_frame_view.h',
@@ skipping 13 matching lines @@
         '../third_party/wtl/include',
       ],
       'conditions': [
         ['use_wayland == 1', {
           'dependencies': [
             '../ui/wayland/wayland.gyp:wayland',
           ],
           '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'],
             ['include', 'widget/tooltip_manager_views.cc'],
           ],
         }],
         ['use_aura==1', {
           'sources/': [
             ['exclude', '_(gtk|x)\\.cc$'],
             ['exclude', '/(gtk|x)_[^/]*\\.cc$'],
             ['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',
             'controls/native_control.cc',
             'controls/native_control.h',
             'controls/scrollbar/bitmap_scroll_bar.cc',
             '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',
-            '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',
             'widget/child_window_message_processor.h',
           ],
         },
         ],
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:x11',
             '../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',
             'widget/native_widget_win.cc',
           ],
         }],
         ['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'],
           ],
         }],
         ['touchui==0', {
           'sources!': [
             '../ui/views/touchui/touch_selection_controller_impl.cc',
             '../ui/views/touchui/touch_selection_controller_impl.h',
           ],
         }],
@@ skipping 22 matching lines @@
           'dependencies': [
             # For accessibility
             '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
           ],
           'include_dirs': [
             '../third_party/wtl/include',
           ],
         }],
         ['use_x11==0', {
           'sources!': [
-            'events/event_x.cc',
+            '../ui/views/events/event_x.cc',
           ],
         }],
       ],
     },
     {
       'target_name': 'views_unittests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
@@ skipping 14 matching lines @@
         '../ui/ui.gyp:ui',
         '../ui/ui.gyp:ui_resources',
         '../ui/ui.gyp:ui_resources_standard',
         'views',
       ],
       'include_dirs': [
         '..',
       ],
       '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',
         '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',
         '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',
         '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',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
           ],
           'conditions': [
             ['linux_use_tcmalloc==1', {
                'dependencies': [
                  '../base/allocator/allocator.gyp:allocator',
                ],
             }],
             [ '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'
               ],
             }],
           ],
         }],
         ['touchui==0', {
           'sources!': [
             '../ui/views/touchui/touch_selection_controller_impl_unittest.cc',
           ],
         }],
         ['OS=="win"', {
           'link_settings': {
             'libraries': [
               '-limm32.lib',
               '-loleacc.lib',
             ]
           },
           'include_dirs': [
             '../third_party/wtl/include',
           ],
         }],
         [ 'use_aura==1', {
           'dependencies': [
             '../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/': [
             ['exclude', '../ui/aura/test/test_desktop_delegate.cc'],
             ['exclude', '../ui/aura/test/test_desktop_delegate.h'],
           ],
         }],
       ],
     },
     {
@@ skipping 259 matching lines @@
               'include_dirs': [
                 '../third_party/wtl/include',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }