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

Side by Side Diff: apps/shell/app_shell.gyp

Issue 254473011: Introduce chrome.shell.createWindow stub API for app_shell (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix deps (shell-api) Created 6 years, 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « apps/shell/DEPS ('k') | apps/shell/app_shell_resources.grd » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
11 'target_name': 'app_shell_resources',
12 'type': 'none',
13 'actions': [
14 {
15 'action_name': 'generate_app_shell_resources',
16 'variables': {
17 'grit_grd_file': 'app_shell_resources.grd',
18 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/apps/shell',
19 },
20 'includes': [ '../../build/grit_action.gypi' ],
21 },
22 ],
23 },
24 {
11 'target_name': 'app_shell_pak', 25 'target_name': 'app_shell_pak',
12 'type': 'none', 26 'type': 'none',
13 'dependencies': [ 27 'dependencies': [
28 'app_shell_resources',
14 # Need extension related resources in common_resources.pak and 29 # Need extension related resources in common_resources.pak and
15 # renderer_resources_100_percent.pak 30 # renderer_resources_100_percent.pak
16 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources', 31 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
17 # Need app related resources in theme_resources_100_percent.pak 32 # Need app related resources in theme_resources_100_percent.pak
18 '<(DEPTH)/chrome/chrome_resources.gyp:theme_resources', 33 '<(DEPTH)/chrome/chrome_resources.gyp:theme_resources',
19 # Need dev-tools related resources in shell_resources.pak and 34 # Need dev-tools related resources in shell_resources.pak and
20 # devtools_resources.pak. 35 # devtools_resources.pak.
21 '<(DEPTH)/content/content_shell_and_tests.gyp:generate_content_shell_res ources', 36 '<(DEPTH)/content/content_shell_and_tests.gyp:generate_content_shell_res ources',
22 '<(DEPTH)/content/browser/devtools/devtools_resources.gyp:devtools_resou rces', 37 '<(DEPTH)/content/browser/devtools/devtools_resources.gyp:devtools_resou rces',
23 '<(DEPTH)/extensions/extensions_resources.gyp:extensions_resources', 38 '<(DEPTH)/extensions/extensions_resources.gyp:extensions_resources',
24 '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings', 39 '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',
25 '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources', 40 '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
26 ], 41 ],
27 'actions': [ 42 'actions': [
28 { 43 {
29 'action_name': 'repack_app_shell_pack', 44 'action_name': 'repack_app_shell_pack',
30 'variables': { 45 'variables': {
31 'pak_inputs': [ 46 'pak_inputs': [
47 '<(SHARED_INTERMEDIATE_DIR)/apps/shell/app_shell_resources.pak',
32 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.pak', 48 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.pak',
33 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.pak', 49 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.pak',
34 # TODO(jamescook): Extract the extension/app related resources 50 # TODO(jamescook): Extract the extension/app related resources
35 # from generated_resources_en-US.pak and 51 # from generated_resources_en-US.pak and
36 # theme_resources_100_percent.pak. 52 # theme_resources_100_percent.pak.
37 '<(SHARED_INTERMEDIATE_DIR)/chrome/generated_resources_en-US.pak', 53 '<(SHARED_INTERMEDIATE_DIR)/chrome/generated_resources_en-US.pak',
38 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources_100_percent. pak', 54 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources_100_percent. pak',
39 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.pak ', 55 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.pak ',
40 '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak', 56 '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak',
41 '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_resources.pak', 57 '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_resources.pak',
(...skipping 18 matching lines...) Expand all
60 '<(DEPTH)/chrome/chrome.gyp:debugger', 76 '<(DEPTH)/chrome/chrome.gyp:debugger',
61 '<(DEPTH)/chrome/chrome.gyp:plugin', 77 '<(DEPTH)/chrome/chrome.gyp:plugin',
62 '<(DEPTH)/chrome/chrome.gyp:renderer', 78 '<(DEPTH)/chrome/chrome.gyp:renderer',
63 '<(DEPTH)/chrome/chrome.gyp:utility', 79 '<(DEPTH)/chrome/chrome.gyp:utility',
64 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources', 80 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
65 '<(DEPTH)/chrome/common/extensions/api/api.gyp:chrome_api', 81 '<(DEPTH)/chrome/common/extensions/api/api.gyp:chrome_api',
66 '<(DEPTH)/third_party/WebKit/public/blink_devtools.gyp:blink_devtools_fr ontend_resources', 82 '<(DEPTH)/third_party/WebKit/public/blink_devtools.gyp:blink_devtools_fr ontend_resources',
67 # TODO(rockot): Dependencies above this line are temporary. 83 # TODO(rockot): Dependencies above this line are temporary.
68 # See http://crbug.com/359656. 84 # See http://crbug.com/359656.
69 'app_shell_pak', 85 'app_shell_pak',
86 '<(DEPTH)/apps/shell/common/api/api.gyp:shell_api',
70 '<(DEPTH)/base/base.gyp:base', 87 '<(DEPTH)/base/base.gyp:base',
71 '<(DEPTH)/base/base.gyp:base_prefs_test_support', 88 '<(DEPTH)/base/base.gyp:base_prefs_test_support',
72 '<(DEPTH)/content/content.gyp:content', 89 '<(DEPTH)/content/content.gyp:content',
73 '<(DEPTH)/content/content.gyp:content_gpu', 90 '<(DEPTH)/content/content.gyp:content_gpu',
74 '<(DEPTH)/content/content.gyp:content_ppapi_plugin', 91 '<(DEPTH)/content/content.gyp:content_ppapi_plugin',
75 '<(DEPTH)/content/content.gyp:content_worker', 92 '<(DEPTH)/content/content.gyp:content_worker',
76 '<(DEPTH)/content/content_shell_and_tests.gyp:content_shell_lib', 93 '<(DEPTH)/content/content_shell_and_tests.gyp:content_shell_lib',
77 '<(DEPTH)/extensions/common/api/api.gyp:extensions_api', 94 '<(DEPTH)/extensions/common/api/api.gyp:extensions_api',
78 '<(DEPTH)/extensions/extensions.gyp:extensions_browser', 95 '<(DEPTH)/extensions/extensions.gyp:extensions_browser',
79 '<(DEPTH)/extensions/extensions.gyp:extensions_common', 96 '<(DEPTH)/extensions/extensions.gyp:extensions_common',
80 '<(DEPTH)/extensions/extensions.gyp:extensions_renderer', 97 '<(DEPTH)/extensions/extensions.gyp:extensions_renderer',
81 '<(DEPTH)/extensions/extensions_resources.gyp:extensions_resources', 98 '<(DEPTH)/extensions/extensions_resources.gyp:extensions_resources',
82 '<(DEPTH)/skia/skia.gyp:skia', 99 '<(DEPTH)/skia/skia.gyp:skia',
83 '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink', 100 '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
84 '<(DEPTH)/ui/wm/wm.gyp:wm', 101 '<(DEPTH)/ui/wm/wm.gyp:wm',
85 '<(DEPTH)/ui/wm/wm.gyp:wm_test_support', 102 '<(DEPTH)/ui/wm/wm.gyp:wm_test_support',
86 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 103 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
87 ], 104 ],
88 'include_dirs': [ 105 'include_dirs': [
89 '../..', 106 '../..',
90 '<(SHARED_INTERMEDIATE_DIR)', 107 '<(SHARED_INTERMEDIATE_DIR)',
108 '<(SHARED_INTERMEDIATE_DIR)/apps/shell',
91 ], 109 ],
92 'sources': [ 110 'sources': [
93 'app/shell_main_delegate.cc', 111 'app/shell_main_delegate.cc',
94 'app/shell_main_delegate.h', 112 'app/shell_main_delegate.h',
113 'browser/api/shell/shell_api.cc',
114 'browser/api/shell/shell_api.h',
95 'browser/shell_app_runtime_api.cc', 115 'browser/shell_app_runtime_api.cc',
96 'browser/shell_app_runtime_api.h', 116 'browser/shell_app_runtime_api.h',
97 'browser/shell_app_sorting.cc', 117 'browser/shell_app_sorting.cc',
98 'browser/shell_app_sorting.h', 118 'browser/shell_app_sorting.h',
99 'browser/shell_app_window.cc', 119 'browser/shell_app_window.cc',
100 'browser/shell_app_window.h', 120 'browser/shell_app_window.h',
101 'browser/shell_app_window_api.cc', 121 'browser/shell_app_window_api.cc',
102 'browser/shell_app_window_api.h', 122 'browser/shell_app_window_api.h',
103 'browser/shell_browser_context.cc', 123 'browser/shell_browser_context.cc',
104 'browser/shell_browser_context.h', 124 'browser/shell_browser_context.h',
(...skipping 12 matching lines...) Expand all
117 'browser/shell_extensions_browser_client.cc', 137 'browser/shell_extensions_browser_client.cc',
118 'browser/shell_extensions_browser_client.h', 138 'browser/shell_extensions_browser_client.h',
119 'common/shell_app_runtime.cc', 139 'common/shell_app_runtime.cc',
120 'common/shell_app_runtime.h', 140 'common/shell_app_runtime.h',
121 'common/shell_content_client.cc', 141 'common/shell_content_client.cc',
122 'common/shell_content_client.h', 142 'common/shell_content_client.h',
123 'common/shell_extensions_client.cc', 143 'common/shell_extensions_client.cc',
124 'common/shell_extensions_client.h', 144 'common/shell_extensions_client.h',
125 'renderer/shell_content_renderer_client.cc', 145 'renderer/shell_content_renderer_client.cc',
126 'renderer/shell_content_renderer_client.h', 146 'renderer/shell_content_renderer_client.h',
147 'renderer/shell_custom_bindings.cc',
148 'renderer/shell_custom_bindings.h',
149 'renderer/shell_custom_bindings.js',
127 'renderer/shell_extensions_renderer_client.cc', 150 'renderer/shell_extensions_renderer_client.cc',
128 'renderer/shell_extensions_renderer_client.h', 151 'renderer/shell_extensions_renderer_client.h',
129 ], 152 ],
130 'conditions': [ 153 'conditions': [
131 ['chromeos==1', { 154 ['chromeos==1', {
132 'dependencies': [ 155 'dependencies': [
133 '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos', 156 '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos',
134 ], 157 ],
135 }], 158 }],
136 ], 159 ],
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 'browser/shell_browsertest.cc', 207 'browser/shell_browsertest.cc',
185 'test/shell_test.h', 208 'test/shell_test.h',
186 'test/shell_test.cc', 209 'test/shell_test.cc',
187 'test/shell_test_launcher_delegate.cc', 210 'test/shell_test_launcher_delegate.cc',
188 'test/shell_test_launcher_delegate.h', 211 'test/shell_test_launcher_delegate.h',
189 'test/shell_tests_main.cc', 212 'test/shell_tests_main.cc',
190 ], 213 ],
191 }, 214 },
192 ], # targets 215 ], # targets
193 } 216 }
OLDNEW
« no previous file with comments | « apps/shell/DEPS ('k') | apps/shell/app_shell_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698