Index: ui/views/views.gyp |
diff --git a/ui/views/views.gyp b/ui/views/views.gyp |
index 518df64e062518316bae392610ea50aeff2ebaa0..e759b221a74d019dccf972c908c22889a84ee203 100644 |
--- a/ui/views/views.gyp |
+++ b/ui/views/views.gyp |
@@ -230,31 +230,6 @@ |
'controls/tree/tree_view.h', |
'controls/tree/tree_view_controller.cc', |
'controls/tree/tree_view_controller.h', |
- 'corewm/base_focus_rules.cc', |
- 'corewm/base_focus_rules.h', |
- 'corewm/capture_controller.cc', |
- 'corewm/capture_controller.h', |
- 'corewm/compound_event_filter.cc', |
- 'corewm/compound_event_filter.h', |
- 'corewm/corewm_switches.cc', |
- 'corewm/corewm_switches.h', |
- 'corewm/cursor_manager.cc', |
- 'corewm/cursor_manager.h', |
- 'corewm/focus_controller.cc', |
- 'corewm/focus_controller.h', |
- 'corewm/focus_rules.h', |
- 'corewm/image_grid.cc', |
- 'corewm/image_grid.h', |
- 'corewm/input_method_event_filter.cc', |
- 'corewm/input_method_event_filter.h', |
- 'corewm/native_cursor_manager.h', |
- 'corewm/native_cursor_manager_delegate.h', |
- 'corewm/shadow.cc', |
- 'corewm/shadow.h', |
- 'corewm/shadow_controller.cc', |
- 'corewm/shadow_controller.h', |
- 'corewm/shadow_types.cc', |
- 'corewm/shadow_types.h', |
'corewm/tooltip.h', |
'corewm/tooltip_aura.cc', |
'corewm/tooltip_aura.h', |
@@ -262,23 +237,6 @@ |
'corewm/tooltip_controller.h', |
'corewm/tooltip_win.cc', |
'corewm/tooltip_win.h', |
- 'corewm/transient_window_controller.cc', |
- 'corewm/transient_window_controller.h', |
- 'corewm/transient_window_manager.cc', |
- 'corewm/transient_window_manager.h', |
- 'corewm/transient_window_observer.h', |
- 'corewm/transient_window_stacking_client.cc', |
- 'corewm/transient_window_stacking_client.h', |
- 'corewm/visibility_controller.cc', |
- 'corewm/visibility_controller.h', |
- 'corewm/window_animations.cc', |
- 'corewm/window_animations.h', |
- 'corewm/window_modality_controller.cc', |
- 'corewm/window_modality_controller.h', |
- 'corewm/window_util.cc', |
- 'corewm/window_util.h', |
- 'corewm/wm_state.cc', |
- 'corewm/wm_state.h', |
'debug_utils.cc', |
'debug_utils.h', |
'drag_controller.h', |
@@ -470,6 +428,49 @@ |
'window/window_resources.h', |
'window/window_shape.cc', |
'window/window_shape.h', |
+ '../wm/core/base_focus_rules.cc', |
+ '../wm/core/base_focus_rules.h', |
+ '../wm/core/capture_controller.cc', |
+ '../wm/core/capture_controller.h', |
+ '../wm/core/compound_event_filter.cc', |
+ '../wm/core/compound_event_filter.h', |
+ '../wm/core/cursor_manager.cc', |
+ '../wm/core/cursor_manager.h', |
+ '../wm/core/focus_controller.cc', |
+ '../wm/core/focus_controller.h', |
+ '../wm/core/focus_rules.h', |
+ '../wm/core/image_grid.cc', |
+ '../wm/core/image_grid.h', |
+ '../wm/core/input_method_event_filter.cc', |
+ '../wm/core/input_method_event_filter.h', |
+ '../wm/core/native_cursor_manager.h', |
+ '../wm/core/native_cursor_manager_delegate.h', |
+ '../wm/core/shadow.cc', |
+ '../wm/core/shadow.h', |
+ '../wm/core/shadow_controller.cc', |
+ '../wm/core/shadow_controller.h', |
+ '../wm/core/shadow_types.cc', |
+ '../wm/core/shadow_types.h', |
+ '../wm/core/transient_window_controller.cc', |
+ '../wm/core/transient_window_controller.h', |
+ '../wm/core/transient_window_manager.cc', |
+ '../wm/core/transient_window_manager.h', |
+ '../wm/core/transient_window_observer.h', |
+ '../wm/core/transient_window_stacking_client.cc', |
+ '../wm/core/transient_window_stacking_client.h', |
+ '../wm/core/visibility_controller.cc', |
+ '../wm/core/visibility_controller.h', |
+ '../wm/core/window_animations.cc', |
+ '../wm/core/window_animations.h', |
+ '../wm/core/window_modality_controller.cc', |
+ '../wm/core/window_modality_controller.h', |
+ '../wm/core/window_util.cc', |
+ '../wm/core/window_util.h', |
+ '../wm/core/wm_core_export.h', |
+ '../wm/core/wm_core_switches.cc', |
+ '../wm/core/wm_core_switches.h', |
+ '../wm/core/wm_state.cc', |
+ '../wm/core/wm_state.h', |
], |
'include_dirs': [ |
'../../third_party/wtl/include', |
@@ -748,18 +749,8 @@ |
'controls/textfield/textfield_model_unittest.cc', |
'controls/tree/tree_view_unittest.cc', |
'corewm/capture_controller_unittest.cc', |
- 'corewm/compound_event_filter_unittest.cc', |
- 'corewm/cursor_manager_unittest.cc', |
- 'corewm/focus_controller_unittest.cc', |
- 'corewm/image_grid_unittest.cc', |
- 'corewm/input_method_event_filter_unittest.cc', |
- 'corewm/shadow_controller_unittest.cc', |
'corewm/tooltip_aura_unittest.cc', |
'corewm/tooltip_controller_unittest.cc', |
- 'corewm/transient_window_manager_unittest.cc', |
- 'corewm/transient_window_stacking_client_unittest.cc', |
- 'corewm/visibility_controller_unittest.cc', |
- 'corewm/window_animations_unittest.cc', |
'focus/focus_manager_test.h', |
'focus/focus_manager_test.cc', |
'focus/focus_manager_unittest.cc', |
@@ -786,6 +777,16 @@ |
'widget/window_reorderer_unittest.cc', |
'window/dialog_client_view_unittest.cc', |
'window/dialog_delegate_unittest.cc', |
+ '../wm/core/compound_event_filter_unittest.cc', |
+ '../wm/core/cursor_manager_unittest.cc', |
+ '../wm/core/focus_controller_unittest.cc', |
+ '../wm/core/input_method_event_filter_unittest.cc', |
+ '../wm/core/image_grid_unittest.cc', |
+ '../wm/core/shadow_controller_unittest.cc', |
+ '../wm/core/transient_window_manager_unittest.cc', |
+ '../wm/core/transient_window_stacking_client_unittest.cc', |
+ '../wm/core/visibility_controller_unittest.cc', |
+ '../wm/core/window_animations_unittest.cc', |
], |
'conditions': [ |
['chromeos==0', { |