Revert 266940 "First step at synchronizing client model changes ..."

trunk/src/mojo/mojo_services.gypi

 {
   'targets': [
     {
       'target_name': 'mojo_echo_bindings',
       'type': 'static_library',
       'sources': [
         'services/dbus_echo/echo.mojom',
       ],
       'variables': {
         'mojom_base_output_dir': 'mojo',
@@ skipping 101 matching lines @@
           ],
         }],
         ['OS=="android"', {
           'dependencies': [
             'mojo_jni_headers',
           ],
         }],
       ],
     },
     {
-      'target_name': 'mojo_view_manager_bindings',
-      'type': 'static_library',
-      'sources': [
-        'services/public/interfaces/view_manager/view_manager.mojom',
-      ],
-      'variables': {
-        'mojom_base_output_dir': 'mojo',
-      },
-      'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
-      'export_dependent_settings': [
-        'mojo_bindings',
-      ],
-      'dependencies': [
-        'mojo_bindings',
-      ],
-    },
-    {
       'target_name': 'mojo_view_manager_lib',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
-        'mojo_view_manager_bindings',
       ],
       'sources': [
         'services/public/cpp/view_manager/lib/view.cc',
         'services/public/cpp/view_manager/lib/view_manager.cc',
-        'services/public/cpp/view_manager/lib/view_manager_private.cc',
-        'services/public/cpp/view_manager/lib/view_manager_private.h',
-        'services/public/cpp/view_manager/lib/view_manager_synchronizer.cc',
-        'services/public/cpp/view_manager/lib/view_manager_synchronizer.h',
         'services/public/cpp/view_manager/lib/view_tree_host.cc',
         'services/public/cpp/view_manager/lib/view_tree_node.cc',
         'services/public/cpp/view_manager/lib/view_tree_node_observer.cc',
         'services/public/cpp/view_manager/lib/view_tree_node_private.cc',
         'services/public/cpp/view_manager/lib/view_tree_node_private.h',
         'services/public/cpp/view_manager/view.h',
         'services/public/cpp/view_manager/view_manager.h',
         'services/public/cpp/view_manager/view_tree_host.h',
         'services/public/cpp/view_manager/view_tree_node.h',
         'services/public/cpp/view_manager/view_tree_node_observer.h',
@@ skipping 14 matching lines @@
         'services/public/cpp/view_manager/tests/view_manager_unittest.cc',
         'services/public/cpp/view_manager/tests/view_tree_host_unittest.cc',
         'services/public/cpp/view_manager/tests/view_tree_node_unittest.cc',
       ],
     },
   ],
   'conditions': [
     ['use_aura==1', {
       'targets': [
         {
+          'target_name': 'mojo_view_manager_bindings',
+          'type': 'static_library',
+          'sources': [
+            'services/public/interfaces/view_manager/view_manager.mojom',
+          ],
+          'variables': {
+            'mojom_base_output_dir': 'mojo',
+          },
+          'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
+          'export_dependent_settings': [
+            'mojo_bindings',
+          ],
+          'dependencies': [
+            'mojo_bindings',
+          ],
+        },
+        {
           'target_name': 'mojo_view_manager',
           'type': '<(component)',
           'dependencies': [
             '../base/base.gyp:base',
             '../skia/skia.gyp:skia',
             '../ui/aura/aura.gyp:aura',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             'mojo_common_lib',
             'mojo_environment_chromium',
             'mojo_launcher_bindings',
@@ skipping 65 matching lines @@
             'mojo_system_impl',
           ],
           'sources': [
             'services/dbus_echo/dbus_echo_service.cc',
           ],
         },
       ],
     }],
   ],
 }