Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(144)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: apps/shell/app_shell.gyp

Issue 412713002: Move apps/shell to extensions/shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 40% Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « apps/shell/app/shell_main_delegate.cc ('k') | apps/shell/app_shell_resources.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/shell/app_shell.gyp
diff --git a/apps/shell/app_shell.gyp b/apps/shell/app_shell.gyp
deleted file mode 100644
index de0a74dbfc5fd6709c4be1561205bea2dc96664d..0000000000000000000000000000000000000000
--- a/apps/shell/app_shell.gyp
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 2014 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,
- },
- 'targets': [
- {
- 'target_name': 'app_shell_resources',
- 'type': 'none',
- 'actions': [
- {
- 'action_name': 'generate_app_shell_resources',
- 'variables': {
- 'grit_grd_file': 'app_shell_resources.grd',
- 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/apps/shell',
- },
- 'includes': [ '../../build/grit_action.gypi' ],
- },
- ],
- },
- {
- 'target_name': 'app_shell_pak',
- 'type': 'none',
- 'dependencies': [
- 'app_shell_resources',
- # Need extension related resources in common_resources.pak and
- # renderer_resources_100_percent.pak
- '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
- # Need dev-tools related resources in shell_resources.pak and
- # devtools_resources.pak.
- '<(DEPTH)/content/content_shell_and_tests.gyp:content_shell_resources',
- '<(DEPTH)/content/browser/devtools/devtools_resources.gyp:devtools_resources',
- '<(DEPTH)/extensions/extensions_resources.gyp:extensions_resources',
- '<(DEPTH)/extensions/extensions_strings.gyp:extensions_strings',
- '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
- '<(DEPTH)/ui/strings/ui_strings.gyp:ui_strings',
- ],
- 'actions': [
- {
- 'action_name': 'repack_app_shell_pack',
- 'variables': {
- 'pak_inputs': [
- '<(SHARED_INTERMEDIATE_DIR)/apps/shell/app_shell_resources.pak',
- '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.pak',
- '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.pak',
- # TODO(jamescook): Extract the extension/app related resources
- # from generated_resources_en-US.pak.
- '<(SHARED_INTERMEDIATE_DIR)/chrome/generated_resources_en-US.pak',
- '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources_100_percent.pak',
- '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak',
- '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_renderer_resources.pak',
- '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_resources.pak',
- '<(SHARED_INTERMEDIATE_DIR)/extensions/strings/extensions_strings_en-US.pak',
- '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
- '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.pak',
- '<(SHARED_INTERMEDIATE_DIR)/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'],
- 'dependencies': [
- 'app_shell_pak',
- '<(DEPTH)/apps/shell/common/api/api.gyp:shell_api',
- '<(DEPTH)/base/base.gyp:base',
- '<(DEPTH)/base/base.gyp:base_prefs_test_support',
- '<(DEPTH)/components/components.gyp:omaha_query_params',
- '<(DEPTH)/components/components.gyp:pref_registry',
- '<(DEPTH)/components/components.gyp:user_prefs',
- '<(DEPTH)/content/content.gyp:content',
- '<(DEPTH)/content/content.gyp:content_gpu',
- '<(DEPTH)/content/content.gyp:content_ppapi_plugin',
- '<(DEPTH)/content/content.gyp:content_worker',
- '<(DEPTH)/content/content_shell_and_tests.gyp:content_shell_lib',
- '<(DEPTH)/extensions/common/api/api.gyp:extensions_api',
- '<(DEPTH)/extensions/extensions.gyp:extensions_browser',
- '<(DEPTH)/extensions/extensions.gyp:extensions_common',
- '<(DEPTH)/extensions/extensions.gyp:extensions_renderer',
- '<(DEPTH)/extensions/extensions_resources.gyp:extensions_resources',
- '<(DEPTH)/mojo/mojo.gyp:mojo_environment_chromium',
- '<(DEPTH)/mojo/mojo.gyp:mojo_system_impl',
- '<(DEPTH)/skia/skia.gyp:skia',
- '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
- '<(DEPTH)/ui/wm/wm.gyp:wm',
- '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
- ],
- 'include_dirs': [
- '../..',
- '<(SHARED_INTERMEDIATE_DIR)',
- '<(SHARED_INTERMEDIATE_DIR)/apps/shell',
- ],
- 'sources': [
- 'app/shell_main_delegate.cc',
- 'app/shell_main_delegate.h',
- 'browser/api/shell/shell_api.cc',
- 'browser/api/shell/shell_api.h',
- 'browser/default_shell_browser_main_delegate.cc',
- 'browser/default_shell_browser_main_delegate.h',
- 'browser/default_shell_app_window_controller.cc',
- 'browser/default_shell_app_window_controller.h',
- 'browser/shell_app_sorting.cc',
- 'browser/shell_app_sorting.h',
- 'browser/shell_app_window.cc',
- 'browser/shell_app_window.h',
- 'browser/shell_app_window_controller.h',
- 'browser/shell_browser_context.cc',
- 'browser/shell_browser_context.h',
- 'browser/shell_browser_main_delegate.h',
- 'browser/shell_browser_main_parts.cc',
- 'browser/shell_browser_main_parts.h',
- 'browser/shell_content_browser_client.cc',
- 'browser/shell_content_browser_client.h',
- 'browser/shell_desktop_controller.cc',
- 'browser/shell_desktop_controller.h',
- 'browser/shell_extension_system.cc',
- 'browser/shell_extension_system.h',
- 'browser/shell_extension_system_factory.cc',
- 'browser/shell_extension_system_factory.h',
- 'browser/shell_extension_web_contents_observer.cc',
- 'browser/shell_extension_web_contents_observer.h',
- 'browser/shell_extensions_browser_client.cc',
- 'browser/shell_extensions_browser_client.h',
- 'browser/shell_network_controller_chromeos.cc',
- 'browser/shell_network_controller_chromeos.h',
- 'browser/shell_omaha_query_params_delegate.cc',
- 'browser/shell_omaha_query_params_delegate.h',
- 'browser/shell_runtime_api_delegate.cc',
- 'browser/shell_runtime_api_delegate.h',
- 'browser/shell_special_storage_policy.cc',
- 'browser/shell_special_storage_policy.h',
- 'common/shell_content_client.cc',
- 'common/shell_content_client.h',
- 'common/shell_extensions_client.cc',
- 'common/shell_extensions_client.h',
- 'common/switches.h',
- 'common/switches.cc',
- 'renderer/shell_content_renderer_client.cc',
- 'renderer/shell_content_renderer_client.h',
- 'renderer/shell_custom_bindings.cc',
- 'renderer/shell_custom_bindings.h',
- 'renderer/shell_custom_bindings.js',
- 'renderer/shell_dispatcher_delegate.cc',
- 'renderer/shell_dispatcher_delegate.h',
- 'renderer/shell_extensions_renderer_client.cc',
- 'renderer/shell_extensions_renderer_client.h',
- 'renderer/shell_renderer_main_delegate.h',
- ],
- 'conditions': [
- ['chromeos==1', {
- 'dependencies': [
- '<(DEPTH)/chromeos/chromeos.gyp:chromeos',
- '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos',
- '<(DEPTH)/ui/display/display.gyp:display',
- ],
- }],
- ],
- },
- {
- 'target_name': 'app_shell',
- 'type': 'executable',
- 'defines!': ['CONTENT_IMPLEMENTATION'],
- 'dependencies': [
- 'app_shell_lib',
- 'app_shell_pak',
- ],
- 'include_dirs': [
- '../..',
- ],
- 'sources': [
- 'app/shell_main.cc',
- ],
- 'conditions': [
- ['OS=="win"', {
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
- },
- },
- 'dependencies': [
- '<(DEPTH)/sandbox/sandbox.gyp:sandbox',
- ],
- }],
- ],
- },
- {
- 'target_name': 'app_shell_browsertests',
- 'type': '<(gtest_target_type)',
- 'dependencies': [
- 'app_shell_lib',
- # TODO(yoz): find the right deps
- '<(DEPTH)/base/base.gyp:test_support_base',
- '<(DEPTH)/content/content.gyp:content_app_both',
- '<(DEPTH)/content/content_shell_and_tests.gyp:content_browser_test_support',
- '<(DEPTH)/content/content_shell_and_tests.gyp:test_support_content',
- '<(DEPTH)/extensions/extensions.gyp:extensions_test_support',
- '<(DEPTH)/testing/gtest.gyp:gtest',
- ],
- 'defines': [
- 'HAS_OUT_OF_PROC_TEST_RUNNER',
- ],
- 'sources': [
- # TODO(yoz): Refactor once we have a second test target.
- 'browser/dns_apitest.cc',
- 'browser/shell_browsertest.cc',
- 'test/shell_test.h',
- 'test/shell_test.cc',
- 'test/shell_test_launcher_delegate.cc',
- 'test/shell_test_launcher_delegate.h',
- 'test/shell_tests_main.cc',
- ],
- },
- ], # targets
-}
« no previous file with comments | « apps/shell/app/shell_main_delegate.cc ('k') | apps/shell/app_shell_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698