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

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: a 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 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 }, 203 },
204 'includes': [ '../build/grit_action.gypi' ], 204 'includes': [ '../build/grit_action.gypi' ],
205 }, 205 },
206 { 206 {
207 'action_name': 'theme_resources_standard', 207 'action_name': 'theme_resources_standard',
208 'variables': { 208 'variables': {
209 'grit_grd_file': 'app/theme/theme_resources_standard.grd', 209 'grit_grd_file': 'app/theme/theme_resources_standard.grd',
210 }, 210 },
211 'includes': [ '../build/grit_action.gypi' ], 211 'includes': [ '../build/grit_action.gypi' ],
212 }, 212 },
213 {
214 'action_name': 'theme_resources_metro_1x',
215 'variables': {
216 'grit_grd_file': 'app/theme/theme_resources_metro_1x.grd',
217 },
218 'includes': [ '../build/grit_action.gypi' ],
219 },
213 ], 220 ],
214 'includes': [ '../build/grit_target.gypi' ], 221 'includes': [ '../build/grit_target.gypi' ],
215 'conditions': [ 222 'conditions': [
216 ['OS != "mac"', { 223 ['OS != "mac"', {
217 # Copy pak files to the product directory. These files will be picked 224 # Copy pak files to the product directory. These files will be picked
218 # up by the following installer scripts: 225 # up by the following installer scripts:
219 # - Windows: chrome/installer/mini_installer/chrome.release 226 # - Windows: chrome/installer/mini_installer/chrome.release
220 # - Linux: chrome/installer/linux/internal/common/installer.include 227 # - Linux: chrome/installer/linux/internal/common/installer.include
221 # Ensure that the above scripts are updated when adding or removing 228 # Ensure that the above scripts are updated when adding or removing
222 # pak files. 229 # pak files.
(...skipping 14 matching lines...) Expand all
237 'copies': [ 244 'copies': [
238 { 245 {
239 'destination': '<(PRODUCT_DIR)', 246 'destination': '<(PRODUCT_DIR)',
240 'files': [ 247 'files': [
241 '<(grit_out_dir)/theme_resources_2x.pak', 248 '<(grit_out_dir)/theme_resources_2x.pak',
242 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_2x/ui_resources_2x.p ak', 249 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_2x/ui_resources_2x.p ak',
243 ], 250 ],
244 }, 251 },
245 ], 252 ],
246 }], 253 }],
254 ['OS != "mac" and enable_metro == 1', {
sky 2012/04/13 22:56:15 Isn't metro going to be win only? If so, shouldn't
sail 2012/04/18 15:46:40 Done.
255 'copies': [
256 {
257 'destination': '<(PRODUCT_DIR)',
258 'files': [
259 '<(grit_out_dir)/theme_resources_metro_1x.pak',
260 ],
261 },
262 ],
263 }],
247 ], 264 ],
248 }, 265 },
249 { 266 {
250 'target_name': 'packed_extra_resources', 267 'target_name': 'packed_extra_resources',
251 'type': 'none', 268 'type': 'none',
252 'variables': { 269 'variables': {
253 'repack_path': '../tools/grit/grit/format/repack.py', 270 'repack_path': '../tools/grit/grit/format/repack.py',
254 }, 271 },
255 'dependencies': [ 272 'dependencies': [
256 'chrome_extra_resources', 273 'chrome_extra_resources',
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 'files': ['<@(default_apps_list)'] 365 'files': ['<@(default_apps_list)']
349 }, 366 },
350 ], 367 ],
351 }], 368 }],
352 ], # conditions 369 ], # conditions
353 }], # end OS != "mac" 370 }], # end OS != "mac"
354 ], # conditions 371 ], # conditions
355 }, 372 },
356 ], # targets 373 ], # targets
357 } 374 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698