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

Side by Side Diff: chrome/chrome_resources.gyp

Issue 222543004: Makes chrome://omnibox use mojo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comment Created 6 years, 8 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
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'variables': { 5 'variables': {
6 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 6 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
7 'about_credits_file': '<(SHARED_INTERMEDIATE_DIR)/about_credits.html', 7 'about_credits_file': '<(SHARED_INTERMEDIATE_DIR)/about_credits.html',
8 'additional_modules_list_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/i nternal/additional_modules_list.txt', 8 'additional_modules_list_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/i nternal/additional_modules_list.txt',
9 'omnibox_mojom_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/ui/webui/om nibox/omnibox.mojom.js',
9 }, 10 },
10 'targets': [ 11 'targets': [
11 { 12 {
12 'target_name': 'chrome_extra_resources', 13 'target_name': 'chrome_extra_resources',
13 'type': 'none', 14 'type': 'none',
14 # These resources end up in resources.pak because they are resources 15 # These resources end up in resources.pak because they are resources
15 # used by internal pages. Putting them in a separate pak file makes 16 # used by internal pages. Putting them in a separate pak file makes
16 # it easier for us to reference them internally. 17 # it easier for us to reference them internally.
17 'actions': [ 18 'actions': [
18 { 19 {
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 ], 165 ],
165 'actions': [ 166 'actions': [
166 # Data resources. 167 # Data resources.
167 { 168 {
168 'action_name': 'browser_resources', 169 'action_name': 'browser_resources',
169 'variables': { 170 'variables': {
170 'grit_grd_file': 'browser/browser_resources.grd', 171 'grit_grd_file': 'browser/browser_resources.grd',
171 'grit_additional_defines': [ 172 'grit_additional_defines': [
172 '-E', 'about_credits_file=<(about_credits_file)', 173 '-E', 'about_credits_file=<(about_credits_file)',
173 '-E', 'additional_modules_list_file=<(additional_modules_list_file )', 174 '-E', 'additional_modules_list_file=<(additional_modules_list_file )',
175 '-E', 'omnibox_mojom_file=<(omnibox_mojom_file)',
174 ], 176 ],
175 }, 177 },
176 'includes': [ '../build/grit_action.gypi' ], 178 'includes': [ '../build/grit_action.gypi' ],
177 }, 179 },
178 { 180 {
179 'action_name': 'common_resources', 181 'action_name': 'common_resources',
180 'variables': { 182 'variables': {
181 'grit_grd_file': 'common/common_resources.grd', 183 'grit_grd_file': 'common/common_resources.grd',
182 }, 184 },
183 'includes': [ '../build/grit_action.gypi' ], 185 'includes': [ '../build/grit_action.gypi' ],
(...skipping 11 matching lines...) Expand all
195 'actions': [ 197 'actions': [
196 { 198 {
197 'action_name': 'extensions_api_resources', 199 'action_name': 'extensions_api_resources',
198 'variables': { 200 'variables': {
199 'grit_grd_file': 'common/extensions_api_resources.grd', 201 'grit_grd_file': 'common/extensions_api_resources.grd',
200 }, 202 },
201 'includes': [ '../build/grit_action.gypi' ], 203 'includes': [ '../build/grit_action.gypi' ],
202 } 204 }
203 ], 205 ],
204 }], 206 }],
207 ['use_mojo==1', {
208 'dependencies': [
209 'chrome_web_ui_mojo_bindings.gyp:web_ui_mojo_bindings',
210 ],
211 }],
205 ], 212 ],
206 'includes': [ '../build/grit_target.gypi' ], 213 'includes': [ '../build/grit_target.gypi' ],
207 }, 214 },
208 { 215 {
209 # TODO(mark): It would be better if each static library that needed 216 # TODO(mark): It would be better if each static library that needed
210 # to run grit would list its own .grd files, but unfortunately some 217 # to run grit would list its own .grd files, but unfortunately some
211 # of the static libraries currently have circular dependencies among 218 # of the static libraries currently have circular dependencies among
212 # generated headers. 219 # generated headers.
213 'target_name': 'chrome_strings', 220 'target_name': 'chrome_strings',
214 'type': 'none', 221 'type': 'none',
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 '<(generator_path)', 503 '<(generator_path)',
497 'credits', 504 'credits',
498 '<(about_credits_file)', 505 '<(about_credits_file)',
499 ], 506 ],
500 'message': 'Generating about:credits', 507 'message': 'Generating about:credits',
501 }, 508 },
502 ], 509 ],
503 }, 510 },
504 ], # targets 511 ], # targets
505 } 512 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698