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

Side by Side Diff: chrome/chrome_resources.gyp

Issue 10082020: Metro/HiDPI: Use metro resource pak in metro mode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix build Created 8 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 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'], 7 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'],
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 }, 210 },
211 'includes': [ '../build/grit_action.gypi' ], 211 'includes': [ '../build/grit_action.gypi' ],
212 }, 212 },
213 { 213 {
214 'action_name': 'theme_resources_standard', 214 'action_name': 'theme_resources_standard',
215 'variables': { 215 'variables': {
216 'grit_grd_file': 'app/theme/theme_resources_standard.grd', 216 'grit_grd_file': 'app/theme/theme_resources_standard.grd',
217 }, 217 },
218 'includes': [ '../build/grit_action.gypi' ], 218 'includes': [ '../build/grit_action.gypi' ],
219 }, 219 },
220 {
221 'action_name': 'theme_resources_metro_1x',
222 'variables': {
223 'grit_grd_file': 'app/theme/theme_resources_metro_1x.grd',
224 },
225 'includes': [ '../build/grit_action.gypi' ],
226 },
220 ], 227 ],
221 'includes': [ '../build/grit_target.gypi' ], 228 'includes': [ '../build/grit_target.gypi' ],
222 }, 229 },
223 { 230 {
224 'target_name': 'theme_resources', 231 'target_name': 'theme_resources',
225 'type': 'none', 232 'type': 'none',
226 'dependencies': [ 233 'dependencies': [
227 'theme_resources_gen', 234 'theme_resources_gen',
228 '<(DEPTH)/ui/ui.gyp:ui_resources_2x', 235 '<(DEPTH)/ui/ui.gyp:ui_resources_2x',
229 '<(DEPTH)/ui/ui.gyp:ui_resources_standard', 236 '<(DEPTH)/ui/ui.gyp:ui_resources_standard',
(...skipping 23 matching lines...) Expand all
253 'copies': [ 260 'copies': [
254 { 261 {
255 'destination': '<(PRODUCT_DIR)', 262 'destination': '<(PRODUCT_DIR)',
256 'files': [ 263 'files': [
257 '<(grit_out_dir)/theme_resources_2x.pak', 264 '<(grit_out_dir)/theme_resources_2x.pak',
258 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_2x/ui_resources_2x.p ak', 265 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_2x/ui_resources_2x.p ak',
259 ], 266 ],
260 }, 267 },
261 ], 268 ],
262 }], 269 }],
270 ['enable_metro == 1', {
271 'copies': [
272 {
273 'destination': '<(PRODUCT_DIR)',
274 'files': [
275 '<(grit_out_dir)/theme_resources_metro_1x.pak',
276 ],
277 },
278 ],
279 }],
263 ], 280 ],
264 }, 281 },
265 { 282 {
266 'target_name': 'packed_extra_resources', 283 'target_name': 'packed_extra_resources',
267 'type': 'none', 284 'type': 'none',
268 'variables': { 285 'variables': {
269 'repack_path': '../tools/grit/grit/format/repack.py', 286 'repack_path': '../tools/grit/grit/format/repack.py',
270 }, 287 },
271 'dependencies': [ 288 'dependencies': [
272 'chrome_extra_resources', 289 'chrome_extra_resources',
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 'files': ['<@(default_apps_list)'] 379 'files': ['<@(default_apps_list)']
363 }, 380 },
364 ], 381 ],
365 }], 382 }],
366 ], # conditions 383 ], # conditions
367 }], # end OS != "mac" 384 }], # end OS != "mac"
368 ], # conditions 385 ], # conditions
369 }, 386 },
370 ], # targets 387 ], # targets
371 } 388 }
OLDNEW
« no previous file with comments | « chrome/app/theme/theme_resources_metro_1x.grd ('k') | chrome/installer/mini_installer/chrome.release » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698