Revert 287680 "mojo: terminate apps if the shell goes away"

trunk/src/mojo/mojo_examples.gypi

 # Copyright 2013 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.
 
 {
   'targets': [
     {
       'target_name': 'mojo_echo_client',
       'type': 'loadable_module',
       'dependencies': [
-        'mojo_base.gyp:mojo_application_standalone',
+        'mojo_base.gyp:mojo_application',
         'mojo_base.gyp:mojo_cpp_bindings',
         'mojo_base.gyp:mojo_environment_standalone',
         'mojo_base.gyp:mojo_utility',
         'mojo_echo_service_bindings',
         '<(mojo_system_for_loadable_module)',
       ],
       'sources': [
         'examples/echo/echo_client.cc',
         'public/cpp/application/lib/mojo_main_standalone.cc',
       ],
@@ skipping 16 matching lines @@
       ],
       'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
       'export_dependent_settings': [
         'mojo_base.gyp:mojo_cpp_bindings',
       ],
     },
     {
       'target_name': 'mojo_echo_service',
       'type': 'loadable_module',
       'dependencies': [
-        'mojo_base.gyp:mojo_application_standalone',
+        'mojo_base.gyp:mojo_application',
         'mojo_base.gyp:mojo_cpp_bindings',
         'mojo_base.gyp:mojo_environment_standalone',
         'mojo_base.gyp:mojo_utility',
         'mojo_echo_service_bindings',
         '<(mojo_system_for_loadable_module)',
       ],
       'sources': [
         'examples/echo/echo_service.cc',
         'public/cpp/application/lib/mojo_main_standalone.cc',
       ],
     },
     {
       'target_name': 'package_mojo_echo_service',
       'variables': {
         'app_name': 'mojo_echo_service',
       },
       'includes': [ 'build/package_app.gypi' ],
     },
     {
       'target_name': 'mojo_sample_app',
       'type': 'loadable_module',
       'dependencies': [
         # TODO(darin): we should not be linking against these libraries!
         '../ui/events/events.gyp:events',
         '../ui/gfx/gfx.gyp:gfx_geometry',
-        'mojo_base.gyp:mojo_application_standalone',
+        'mojo_base.gyp:mojo_application',
         'mojo_base.gyp:mojo_cpp_bindings',
         'mojo_base.gyp:mojo_environment_standalone',
         'mojo_base.gyp:mojo_utility',
         'mojo_geometry_bindings',
         'mojo_gles2',
         'mojo_native_viewport_bindings',
         '<(mojo_system_for_loadable_module)',
       ],
       'sources': [
         'examples/sample_app/gles2_client_impl.cc',
@@ skipping 12 matching lines @@
       'includes': [ 'build/package_app.gypi' ],
     },
     {
       'target_name': 'mojo_compositor_app',
       'type': 'loadable_module',
       'dependencies': [
         '../base/base.gyp:base',
         '../cc/cc.gyp:cc',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
-        'mojo_base.gyp:mojo_application_chromium',
+        'mojo_base.gyp:mojo_application',
         'mojo_base.gyp:mojo_common_lib',
         'mojo_base.gyp:mojo_environment_chromium',
         'mojo_cc_support',
         'mojo_geometry_bindings',
         'mojo_geometry_lib',
         'mojo_gles2',
         'mojo_native_viewport_bindings',
         '<(mojo_system_for_loadable_module)',
       ],
       'sources': [
         'examples/compositor_app/compositor_app.cc',
         'examples/compositor_app/compositor_host.cc',
         'examples/compositor_app/compositor_host.h',
         'public/cpp/application/lib/mojo_main_chromium.cc',
       ],
     },
     {
       'target_name': 'package_mojo_compositor_app',
       'variables': {
         'app_name': 'mojo_compositor_app',
       },
       'includes': [ 'build/package_app.gypi' ],
     },
     {
       'target_name': 'mojo_wget',
       'type': 'loadable_module',
       'dependencies': [
-        'mojo_base.gyp:mojo_application_standalone',
+        'mojo_base.gyp:mojo_application',
         'mojo_base.gyp:mojo_cpp_bindings',
         'mojo_base.gyp:mojo_environment_standalone',
         'mojo_base.gyp:mojo_utility',
         'mojo_network_bindings',
         '<(mojo_system_for_loadable_module)',
       ],
       'sources': [
         'examples/wget/wget.cc',
         'public/cpp/application/lib/mojo_main_standalone.cc',
       ],
@@ skipping 18 matching lines @@
       'dependencies': [
         'mojo_base.gyp:mojo_cpp_bindings',
       ],
     },
     {
       'target_name': 'mojo_png_viewer',
       'type': 'loadable_module',
       'dependencies': [
         '../skia/skia.gyp:skia',
         '../ui/gfx/gfx.gyp:gfx',
-        'mojo_base.gyp:mojo_application_chromium',
+        'mojo_base.gyp:mojo_application',
         'mojo_base.gyp:mojo_cpp_bindings',
         'mojo_base.gyp:mojo_environment_chromium',
         'mojo_base.gyp:mojo_utility',
         'mojo_media_viewer_bindings',
         'mojo_navigation_bindings',
         'mojo_network_bindings',
         'mojo_launcher_bindings',
         'mojo_view_manager_lib',
         '<(mojo_system_for_loadable_module)',
       ],
       'sources': [
         'examples/png_viewer/png_viewer.cc',
         'public/cpp/application/lib/mojo_main_chromium.cc',
       ],
     },
     {
       'target_name': 'mojo_pepper_container_app',
       'type': 'loadable_module',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../gpu/gpu.gyp:command_buffer_common',
         '../ppapi/ppapi.gyp:ppapi_c',
         '../ppapi/ppapi_internal.gyp:ppapi_example_gles2_spinning_cube',
         '../ui/events/events.gyp:events_base',
-        'mojo_base.gyp:mojo_application_chromium',
+        'mojo_base.gyp:mojo_application',
         'mojo_base.gyp:mojo_common_lib',
         'mojo_base.gyp:mojo_environment_chromium',
         'mojo_geometry_bindings',
         'mojo_gles2',
         'mojo_native_viewport_bindings',
         '<(mojo_system_for_loadable_module)',
       ],
       'defines': [
         # We don't really want to export. We could change how
         # ppapi_{shared,thunk}_export.h are defined to avoid this.
@@ skipping 75 matching lines @@
     {
       'target_name': 'mojo_surfaces_app',
       'type': 'loadable_module',
       'dependencies': [
         '../base/base.gyp:base',
         '../cc/cc.gyp:cc',
         '../cc/cc.gyp:cc_surfaces',
         '../skia/skia.gyp:skia',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
-        'mojo_base.gyp:mojo_application_chromium',
+        'mojo_base.gyp:mojo_application',
         'mojo_base.gyp:mojo_common_lib',
         'mojo_base.gyp:mojo_environment_chromium',
         'mojo_base.gyp:mojo_system_impl',
         'mojo_geometry_bindings',
         'mojo_geometry_lib',
         'mojo_gles2',
         'mojo_native_viewport_bindings',
         'mojo_surfaces_bindings',
         'mojo_surfaces_app_bindings',
         'mojo_surfaces_lib',
@@ skipping 34 matching lines @@
     {
       'target_name': 'mojo_surfaces_child_app',
       'type': 'loadable_module',
       'dependencies': [
         '../base/base.gyp:base',
         '../cc/cc.gyp:cc',
         '../cc/cc.gyp:cc_surfaces',
         '../skia/skia.gyp:skia',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
-        'mojo_base.gyp:mojo_application_chromium',
+        'mojo_base.gyp:mojo_application',
         'mojo_base.gyp:mojo_common_lib',
         'mojo_base.gyp:mojo_environment_chromium',
         'mojo_base.gyp:mojo_system_impl',
         'mojo_geometry_bindings',
         'mojo_geometry_lib',
         'mojo_surfaces_app_bindings',
         'mojo_surfaces_bindings',
         'mojo_surfaces_lib',
         '<(mojo_system_for_loadable_module)',
       ],
@@ skipping 14 matching lines @@
           'target_name': 'mojo_aura_demo',
           'type': 'loadable_module',
           'dependencies': [
             '../base/base.gyp:base',
             '../cc/cc.gyp:cc',
             '../ui/aura/aura.gyp:aura',
             '../ui/base/ui_base.gyp:ui_base',
             '../ui/compositor/compositor.gyp:compositor',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
-            'mojo_base.gyp:mojo_application_chromium',
+            'mojo_base.gyp:mojo_application',
             'mojo_base.gyp:mojo_common_lib',
             'mojo_base.gyp:mojo_environment_chromium',
             'mojo_aura_support',
             'mojo_geometry_bindings',
             'mojo_geometry_lib',
             'mojo_view_manager_lib',
             '<(mojo_system_for_loadable_module)',
           ],
           'sources': [
             'examples/aura_demo/aura_demo.cc',
             'public/cpp/application/lib/mojo_main_chromium.cc',
           ],
         },
         {
           'target_name': 'mojo_aura_demo_init',
           'type': 'loadable_module',
           'dependencies': [
             '../base/base.gyp:base',
-            'mojo_base.gyp:mojo_application_chromium',
+            'mojo_base.gyp:mojo_application',
             'mojo_base.gyp:mojo_environment_chromium',
             'mojo_view_manager_bindings',
             '<(mojo_system_for_loadable_module)',
           ],
           'sources': [
             'examples/aura_demo/view_manager_init.cc',
             'public/cpp/application/lib/mojo_main_chromium.cc',
           ],
         },
         {
           'target_name': 'mojo_browser',
           'type': 'loadable_module',
           'dependencies': [
             '../base/base.gyp:base',
             '../cc/cc.gyp:cc',
             '../third_party/icu/icu.gyp:icui18n',
             '../third_party/icu/icu.gyp:icuuc',
             '../ui/aura/aura.gyp:aura',
             '../ui/base/ui_base.gyp:ui_base',
             '../ui/compositor/compositor.gyp:compositor',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             '../ui/resources/ui_resources.gyp:ui_resources',
             '../ui/resources/ui_resources.gyp:ui_test_pak',
             '../ui/views/views.gyp:views',
             '../url/url.gyp:url_lib',
-            'mojo_base.gyp:mojo_application_chromium',
+            'mojo_base.gyp:mojo_application',
             'mojo_base.gyp:mojo_common_lib',
             'mojo_base.gyp:mojo_environment_chromium',
             'mojo_aura_support',
             'mojo_geometry_bindings',
             'mojo_geometry_lib',
             'mojo_input_events_lib',
             'mojo_navigation_bindings',
             'mojo_views_support',
             'mojo_view_manager_bindings',
             'mojo_view_manager_lib',
@@ skipping 14 matching lines @@
         },
         {
           'target_name': 'mojo_demo_launcher',
           'type': 'loadable_module',
           'dependencies': [
             '../base/base.gyp:base',
             '../skia/skia.gyp:skia',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             '../ui/gl/gl.gyp:gl',
-            'mojo_base.gyp:mojo_application_chromium',
+            'mojo_base.gyp:mojo_application',
             'mojo_base.gyp:mojo_cpp_bindings',
             'mojo_base.gyp:mojo_environment_chromium',
             'mojo_base.gyp:mojo_utility',
             'mojo_geometry_bindings',
             'mojo_gles2',
             'mojo_view_manager_bindings',
             '<(mojo_system_for_loadable_module)',
           ],
           'sources': [
             'examples/demo_launcher/demo_launcher.cc',
@@ skipping 10 matching lines @@
             '../third_party/icu/icu.gyp:icuuc',
             '../ui/aura/aura.gyp:aura',
             '../ui/base/ui_base.gyp:ui_base',
             '../ui/compositor/compositor.gyp:compositor',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             '../ui/resources/ui_resources.gyp:ui_resources',
             '../ui/resources/ui_resources.gyp:ui_test_pak',
             '../ui/views/views.gyp:views',
             '../url/url.gyp:url_lib',
-            'mojo_base.gyp:mojo_application_chromium',
+            'mojo_base.gyp:mojo_application',
             'mojo_base.gyp:mojo_common_lib',
             'mojo_base.gyp:mojo_environment_chromium',
             'mojo_aura_support',
             'mojo_geometry_bindings',
             'mojo_geometry_lib',
             'mojo_input_events_lib',
             'mojo_keyboard_bindings',
             'mojo_navigation_bindings',
             'mojo_views_support',
             'mojo_view_manager_bindings',
@@ skipping 45 matching lines @@
           'dependencies': [
             '../base/base.gyp:base',
             '../ui/aura/aura.gyp:aura',
             '../ui/base/ui_base.gyp:ui_base',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             '../ui/gl/gl.gyp:gl',
             '../ui/resources/ui_resources.gyp:ui_resources',
             '../ui/resources/ui_resources.gyp:ui_test_pak',
             '../ui/views/views.gyp:views',
-            'mojo_base.gyp:mojo_application_chromium',
+            'mojo_base.gyp:mojo_application',
             'mojo_base.gyp:mojo_cpp_bindings',
             'mojo_base.gyp:mojo_utility',
             'mojo_base.gyp:mojo_environment_chromium',
             'mojo_aura_support',
             'mojo_geometry_bindings',
             'mojo_geometry_lib',
             'mojo_gles2',
             'mojo_input_events_lib',
             'mojo_keyboard_bindings',
             'mojo_launcher_bindings',
@@ skipping 11 matching lines @@
           ],
         },
         {
           'target_name': 'mojo_embedded_app',
           'type': 'loadable_module',
           'dependencies': [
             '../base/base.gyp:base',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             '../ui/gl/gl.gyp:gl',
             '../url/url.gyp:url_lib',
-            'mojo_base.gyp:mojo_application_chromium',
+            'mojo_base.gyp:mojo_application',
             'mojo_base.gyp:mojo_cpp_bindings',
             'mojo_base.gyp:mojo_environment_chromium',
             'mojo_base.gyp:mojo_utility',
             'mojo_geometry_bindings',
             'mojo_gles2',
             'mojo_navigation_bindings',
             'mojo_view_manager_lib',
             'mojo_window_manager_bindings',
             '<(mojo_system_for_loadable_module)',
           ],
           'sources': [
             'examples/embedded_app/embedded_app.cc',
             'public/cpp/application/lib/mojo_main_chromium.cc',
           ],
         },
         {
           'target_name': 'mojo_nesting_app',
           'type': 'loadable_module',
           'dependencies': [
             '../base/base.gyp:base',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             '../ui/gl/gl.gyp:gl',
             '../url/url.gyp:url_lib',
-            'mojo_base.gyp:mojo_application_chromium',
+            'mojo_base.gyp:mojo_application',
             'mojo_base.gyp:mojo_cpp_bindings',
             'mojo_base.gyp:mojo_environment_chromium',
             'mojo_base.gyp:mojo_utility',
             'mojo_geometry_bindings',
             'mojo_gles2',
             'mojo_navigation_bindings',
             'mojo_view_manager_lib',
             'mojo_window_manager_bindings',
             '<(mojo_system_for_loadable_module)',
           ],
           'sources': [
             'examples/nesting_app/nesting_app.cc',
             'public/cpp/application/lib/mojo_main_chromium.cc',
           ],
         },
         {
           'target_name': 'mojo_media_viewer',
           'type': 'loadable_module',
           'dependencies': [
             '../base/base.gyp:base',
             '../skia/skia.gyp:skia',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             '../ui/views/views.gyp:views',
-            'mojo_base.gyp:mojo_application_chromium',
+            'mojo_base.gyp:mojo_application',
             'mojo_base.gyp:mojo_environment_chromium',
             'mojo_input_events_lib',
             'mojo_media_viewer_bindings',
             'mojo_navigation_bindings',
             'mojo_views_support',
             'mojo_view_manager_bindings',
             'mojo_view_manager_lib',
             '<(mojo_system_for_loadable_module)',
           ],
           'sources': [
             'examples/media_viewer/media_viewer.cc',
             'public/cpp/application/lib/mojo_main_chromium.cc',
           ],
         },
         {
           'target_name': 'mojo_wm_flow_wm',
           'type': 'loadable_module',
           'dependencies': [
             '../base/base.gyp:base',
-            'mojo_base.gyp:mojo_application_chromium',
+            'mojo_base.gyp:mojo_application',
             'mojo_base.gyp:mojo_environment_chromium',
             'mojo_core_window_manager_lib',
             'mojo_view_manager_lib',
             '<(mojo_system_for_loadable_module)',
           ],
           'sources': [
             'examples/wm_flow/wm/wm.cc',
             'public/cpp/application/lib/mojo_main_chromium.cc',
           ],
         },
         {
           'target_name': 'mojo_wm_flow_init',
           'type': 'loadable_module',
           'dependencies': [
             '../base/base.gyp:base',
-            'mojo_base.gyp:mojo_application_chromium',
+            'mojo_base.gyp:mojo_application',
             'mojo_base.gyp:mojo_environment_chromium',
             'mojo_view_manager_bindings',
             '<(mojo_system_for_loadable_module)',
           ],
           'sources': [
             'examples/wm_flow/init/init.cc',
             'public/cpp/application/lib/mojo_main_chromium.cc',
           ],
         },
         {
           'target_name': 'mojo_wm_flow_app',
           'type': 'loadable_module',
           'dependencies': [
             '../base/base.gyp:base',
-            'mojo_base.gyp:mojo_application_chromium',
+            'mojo_base.gyp:mojo_application',
             'mojo_base.gyp:mojo_environment_chromium',
             'mojo_core_window_manager_bindings',
             'mojo_view_manager_lib',
             '<(mojo_system_for_loadable_module)',
           ],
           'sources': [
             'examples/wm_flow/app/app.cc',
             'public/cpp/application/lib/mojo_main_chromium.cc',
           ],
         },
       ],
     }],
     ['OS=="linux"', {
       'targets': [
         {
           'target_name': 'mojo_dbus_echo',
           'type': 'loadable_module',
           'dependencies': [
             '../base/base.gyp:base',
-            'mojo_base.gyp:mojo_application_standalone',
+            'mojo_base.gyp:mojo_application',
             'mojo_base.gyp:mojo_cpp_bindings',
             'mojo_base.gyp:mojo_environment_standalone',
             'mojo_base.gyp:mojo_utility',
             'mojo_echo_bindings',
             '<(mojo_system_for_loadable_module)',
           ],
           'sources': [
             'examples/dbus_echo/dbus_echo_app.cc',
             'public/cpp/application/lib/mojo_main_standalone.cc',
           ],
         },
       ],
     }],
   ],
 }