Move wm/core to wm namespace.

ui/views/views.gyp

Index: ui/views/views.gyp
diff --git a/ui/views/views.gyp b/ui/views/views.gyp
index 069633c5ca359d85ef098524b586c150a528398c..9b010e7961d23f87e52a204a244441cc0e51c455 100644
--- a/ui/views/views.gyp
+++ b/ui/views/views.gyp
@@ -36,7 +36,7 @@
         '../gfx/gfx.gyp:gfx_geometry',
         '../native_theme/native_theme.gyp:native_theme',
         '../resources/ui_resources.gyp:ui_resources',
-        '../wm/wm.gyp:wm_public',
+        '../wm/wm.gyp:wm_core',
       ],
       'export_dependent_settings': [
         '../accessibility/accessibility.gyp:ax_gen',
@@ -417,49 +417,6 @@
         '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',
@@ -553,6 +510,7 @@
         '../events/events.gyp:events',
         '../gfx/gfx.gyp:gfx',
         '../gfx/gfx.gyp:gfx_geometry',
+        '../wm/wm.gyp:wm_core',
         'views',
       ],
       'include_dirs': [
@@ -644,7 +602,7 @@
         '../resources/ui_resources.gyp:ui_resources',
         '../resources/ui_resources.gyp:ui_test_pak',
         '../ui_unittests.gyp:ui_test_support',
-        '../wm/wm.gyp:wm_public',
+        '../wm/wm.gyp:wm_core',
         'views',
         'views_test_support',
       ],
@@ -710,16 +668,6 @@
         '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', {