Move wm/public into wm target

ui/views/views.gyp

 # Copyright (c) 2012 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': [
       ['OS!="linux" or chromeos==1', {
@@ skipping 18 matching lines @@
         '../aura/aura.gyp:aura',
         '../base/strings/ui_strings.gyp:ui_strings',
         '../base/ui_base.gyp:ui_base',
         '../compositor/compositor.gyp:compositor',
         '../events/events.gyp:events',
         '../events/events.gyp:events_base',
         '../gfx/gfx.gyp:gfx',
         '../gfx/gfx.gyp:gfx_geometry',
         '../native_theme/native_theme.gyp:native_theme',
         '../resources/ui_resources.gyp:ui_resources',
-        '../wm/wm.gyp:wm_core',
+        '../wm/wm.gyp:wm',
       ],
       'export_dependent_settings': [
         '../accessibility/accessibility.gyp:ax_gen',
       ],
       'defines': [
         'VIEWS_IMPLEMENTATION',
       ],
       'sources': [
         # All .cc, .h under views, except unittests
         'accessibility/native_view_accessibility.cc',
@@ skipping 458 matching lines @@
         '../../ipc/ipc.gyp:test_support_ipc',
         '../../skia/skia.gyp:skia',
         '../../testing/gtest.gyp:gtest',
         '../aura/aura.gyp:aura',
         '../aura/aura.gyp:aura_test_support',
         '../base/ui_base.gyp:ui_base',
         '../compositor/compositor.gyp:compositor',
         '../events/events.gyp:events',
         '../gfx/gfx.gyp:gfx',
         '../gfx/gfx.gyp:gfx_geometry',
-        '../wm/wm.gyp:wm_core',
+        '../wm/wm.gyp:wm',
+        '../wm/wm.gyp:wm_test_support',
         'views',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'corewm/tooltip_controller_test_helper.cc',
         'corewm/tooltip_controller_test_helper.h',
         'test/capture_tracking_view.cc',
         'test/capture_tracking_view.h',
@@ skipping 44 matching lines @@
         '../base/strings/ui_strings.gyp:ui_strings',
         '../base/ui_base.gyp:ui_base',
         '../compositor/compositor.gyp:compositor',
         '../compositor/compositor.gyp:compositor_test_support',
         '../events/events.gyp:events',
         '../gfx/gfx.gyp:gfx',
         '../gfx/gfx.gyp:gfx_geometry',
         '../resources/ui_resources.gyp:ui_resources',
         '../resources/ui_resources.gyp:ui_test_pak',
         '../ui_unittests.gyp:ui_test_support',
-        '../wm/wm.gyp:wm_core',
+        '../wm/wm.gyp:wm',
         'views',
         'views_test_support',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'accessibility/native_view_accessibility_win_unittest.cc',
         'accessible_pane_view_unittest.cc',
         'animation/bounds_animator_unittest.cc',
@@ skipping 97 matching lines @@
         }],
         ['use_ozone==1', {
           'sources!': [
             'corewm/capture_controller_unittest.cc',
           ],
         }],
       ],
     },  # target_name: views_unittests
   ],
 }