Reland 261559: Create new app_shell.gyp for app_shell targets.

apps/apps.gypi

Index: apps/apps.gypi
diff --git a/apps/apps.gypi b/apps/apps.gypi
index b82d133e73cae5ee4df880067c2ed4ff1e93ca45..998f7e48cccd58c483000a93cd4b0abaa0f53cf2 100644
--- a/apps/apps.gypi
+++ b/apps/apps.gypi
@@ -103,167 +103,4 @@
       'msvs_disabled_warnings': [ 4267, ],
     },
   ],  # targets
-  'conditions': [
-    ['chromeos==1 or (OS=="linux" and use_aura==1) or (OS=="win" and use_aura==1)', {
-      'targets': [
-        {
-          'target_name': 'app_shell_pak',
-          'type': 'none',
-          'dependencies': [
-            # Need extension related resources in common_resources.pak and
-            # renderer_resources_100_percent.pak
-            'chrome_resources.gyp:chrome_resources',
-            # Need app related resources in theme_resources_100_percent.pak
-            'chrome_resources.gyp:theme_resources',
-            # Need dev-tools related resources in shell_resources.pak and
-            # devtools_resources.pak.
-            '../content/content_shell_and_tests.gyp:generate_content_shell_resources',
-            '../content/browser/devtools/devtools_resources.gyp:devtools_resources',
-            '../ui/base/strings/ui_strings.gyp:ui_strings',
-            '../ui/resources/ui_resources.gyp:ui_resources',
-          ],
-          'actions': [
-            {
-              'action_name': 'repack_app_shell_pack',
-              'variables': {
-                'pak_inputs': [
-                  '<(grit_out_dir)/common_resources.pak',
-                  '<(grit_out_dir)/extensions_api_resources.pak',
-                  # TODO(jamescook): extra the extension/app related resources
-                  # from generated_resources_en-US.pak and
-                  # theme_resources_100_percent.pak.
-                  '<(SHARED_INTERMEDIATE_DIR)/chrome/generated_resources_en-US.pak',
-                  '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources_100_percent.pak',
-                  '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.pak',
-                  '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak',
-                  '<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings/app_locale_settings_en-US.pak',
-                  '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
-                  '<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings/ui_strings_en-US.pak',
-                  '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
-                ],
-                'pak_output': '<(PRODUCT_DIR)/app_shell.pak',
-              },
-             'includes': [ '../build/repack_action.gypi' ],
-            },
-          ],
-        },
-        {
-          'target_name': 'app_shell_lib',
-          'type': 'static_library',
-          'defines!': ['CONTENT_IMPLEMENTATION'],
-          'variables': {
-            'chromium_code': 1,
-          },
-          'dependencies': [
-            'app_shell_pak',
-            'apps',
-            'common/extensions/api/api.gyp:chrome_api',
-            'test_support_common',
-            '../base/base.gyp:base',
-            '../base/base.gyp:base_prefs_test_support',
-            '../content/content.gyp:content',
-            '../content/content_shell_and_tests.gyp:content_shell_lib',
-            '../extensions/common/api/api.gyp:extensions_api',
-            '../skia/skia.gyp:skia',
-            '../ui/views/views.gyp:views',
-            '../ui/wm/wm.gyp:wm_test_support',
-          ],
-          'include_dirs': [
-            '..',
-          ],
-          'sources': [
-            'shell/app/shell_main_delegate.cc',
-            'shell/app/shell_main_delegate.h',
-            'shell/browser/shell_app_sorting.cc',
-            'shell/browser/shell_app_sorting.h',
-            'shell/browser/shell_app_window_delegate.cc',
-            'shell/browser/shell_app_window_delegate.h',
-            'shell/browser/shell_apps_client.cc',
-            'shell/browser/shell_apps_client.h',
-            'shell/browser/shell_browser_context.cc',
-            'shell/browser/shell_browser_context.h',
-            'shell/browser/shell_browser_main_parts.cc',
-            'shell/browser/shell_browser_main_parts.h',
-            'shell/browser/shell_content_browser_client.cc',
-            'shell/browser/shell_content_browser_client.h',
-            'shell/browser/shell_desktop_controller.cc',
-            'shell/browser/shell_desktop_controller.h',
-            'shell/browser/shell_extension_system.cc',
-            'shell/browser/shell_extension_system.h',
-            'shell/browser/shell_extension_system_factory.cc',
-            'shell/browser/shell_extension_system_factory.h',
-            'shell/browser/shell_extension_web_contents_observer.cc',
-            'shell/browser/shell_extension_web_contents_observer.h',
-            'shell/browser/shell_extensions_browser_client.cc',
-            'shell/browser/shell_extensions_browser_client.h',
-            'shell/common/shell_content_client.cc',
-            'shell/common/shell_content_client.h',
-            'shell/common/shell_extensions_client.cc',
-            'shell/common/shell_extensions_client.h',
-            'shell/renderer/shell_content_renderer_client.cc',
-            'shell/renderer/shell_content_renderer_client.h',
-          ],
-        },
-        {
-          'target_name': 'app_shell',
-          'type': 'executable',
-          'defines!': ['CONTENT_IMPLEMENTATION'],
-          'variables': {
-            'chromium_code': 1,
-          },
-          'dependencies': [
-            'app_shell_lib',
-            'app_shell_pak',
-          ],
-          'include_dirs': [
-            '..',
-          ],
-          'sources': [
-            'shell/app/shell_main.cc',
-          ],
-          'conditions': [
-            ['OS=="win"', {
-              'msvs_settings': {
-                'VCLinkerTool': {
-                  'SubSystem': '2',  # Set /SUBSYSTEM:WINDOWS
-                },
-              },
-              'msvs_large_pdb': 1,
-              'dependencies': [
-                '../sandbox/sandbox.gyp:sandbox',
-              ],
-            }],
-          ],
-        },
-        {
-          'target_name': 'apps_browsertests',
-          'type': '<(gtest_target_type)',
-          'variables': {
-            'chromium_code': 1,
-          },
-          'dependencies': [
-            'app_shell_lib',
-            # TODO(yoz): find the right deps
-            '../base/base.gyp:test_support_base',
-            '../content/content.gyp:content_app_both',
-            '../content/content_shell_and_tests.gyp:content_browser_test_support',
-            '../content/content_shell_and_tests.gyp:test_support_content',
-            '../testing/gtest.gyp:gtest',
-          ],
-          'defines': [
-            'HAS_OUT_OF_PROC_TEST_RUNNER',
-          ],
-          'msvs_large_pdb': 1,
-          'sources': [
-            # TODO(yoz): Refactor once we have a second test target.
-            'test/app_shell_test.h',
-            'test/app_shell_test.cc',
-            'test/apps_test_launcher_delegate.cc',
-            'test/apps_test_launcher_delegate.h',
-            'test/apps_tests_main.cc',
-          ],
-        },
-      ],  # targets
-    }],  # chromeos==1 or linux aura or win aura
-  ],  # conditions
 }