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

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: get working with mojo changes 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 | « chrome/chrome_browser_ui.gypi ('k') | chrome/chrome_web_ui_mojo_bindings.gyp » ('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 (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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 { 156 {
156 # TODO(mark): It would be better if each static library that needed 157 # TODO(mark): It would be better if each static library that needed
157 # to run grit would list its own .grd files, but unfortunately some 158 # to run grit would list its own .grd files, but unfortunately some
158 # of the static libraries currently have circular dependencies among 159 # of the static libraries currently have circular dependencies among
159 # generated headers. 160 # generated headers.
160 'target_name': 'chrome_resources', 161 'target_name': 'chrome_resources',
161 'type': 'none', 162 'type': 'none',
162 'dependencies': [ 163 'dependencies': [
163 'about_credits', 164 'about_credits',
164 'chrome_internal_resources_gen', 165 'chrome_internal_resources_gen',
166 'chrome_web_ui_mojo_bindings.gyp:web_ui_mojo_bindings',
165 ], 167 ],
166 'actions': [ 168 'actions': [
167 # Data resources. 169 # Data resources.
168 { 170 {
169 'action_name': 'browser_resources', 171 'action_name': 'browser_resources',
170 'variables': { 172 'variables': {
171 'grit_grd_file': 'browser/browser_resources.grd', 173 'grit_grd_file': 'browser/browser_resources.grd',
172 'grit_additional_defines': [ 174 'grit_additional_defines': [
173 '-E', 'about_credits_file=<(about_credits_file)', 175 '-E', 'about_credits_file=<(about_credits_file)',
174 '-E', 'additional_modules_list_file=<(additional_modules_list_file )', 176 '-E', 'additional_modules_list_file=<(additional_modules_list_file )',
177 '-E', 'omnibox_mojom_file=<(omnibox_mojom_file)',
175 ], 178 ],
176 }, 179 },
177 'includes': [ '../build/grit_action.gypi' ], 180 'includes': [ '../build/grit_action.gypi' ],
178 }, 181 },
179 { 182 {
180 'action_name': 'common_resources', 183 'action_name': 'common_resources',
181 'variables': { 184 'variables': {
182 'grit_grd_file': 'common/common_resources.grd', 185 'grit_grd_file': 'common/common_resources.grd',
183 }, 186 },
184 'includes': [ '../build/grit_action.gypi' ], 187 'includes': [ '../build/grit_action.gypi' ],
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/resources/chromeos/chrom evox', 519 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/resources/chromeos/chrom evox',
517 # We don't generate any RC files, so no resource_ds file is needed. 520 # We don't generate any RC files, so no resource_ds file is needed.
518 'grit_resource_ids': '', 521 'grit_resource_ids': '',
519 }, 522 },
520 'includes': [ '../build/grit_action.gypi' ], 523 'includes': [ '../build/grit_action.gypi' ],
521 }, 524 },
522 ], 525 ],
523 }, 526 },
524 ], # targets 527 ], # targets
525 } 528 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | chrome/chrome_web_ui_mojo_bindings.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698