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

Side by Side Diff: chrome/chrome_resources.gyp

Issue 10829281: Make ChromeOS imply enable_hidpi (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 | « build/common.gypi ('k') | no next file » | 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 '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 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 # This location is for the Windows and Linux builds. For 341 # This location is for the Windows and Linux builds. For
342 # Windows, the chrome.release file ensures that these files 342 # Windows, the chrome.release file ensures that these files
343 # are copied into the installer. Note that we have a separate 343 # are copied into the installer. Note that we have a separate
344 # section in chrome_dll.gyp to copy these files for Mac, as it 344 # section in chrome_dll.gyp to copy these files for Mac, as it
345 # needs to be dropped inside the framework. 345 # needs to be dropped inside the framework.
346 'destination': '<(PRODUCT_DIR)/default_apps', 346 'destination': '<(PRODUCT_DIR)/default_apps',
347 'files': ['<@(default_apps_list)'] 347 'files': ['<@(default_apps_list)']
348 }, 348 },
349 ], 349 ],
350 }], 350 }],
351 ['enable_hidpi == 1 or chromeos == 1', { 351 ['enable_hidpi == 1', {
352 'copies': [ 352 'copies': [
353 { 353 {
354 'destination': '<(PRODUCT_DIR)', 354 'destination': '<(PRODUCT_DIR)',
355 'files': [ 355 'files': [
356 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_200_percent.pak', 356 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_200_percent.pak',
357 ], 357 ],
358 }, 358 },
359 ], 359 ],
360 }], 360 }],
361 ['enable_touch_ui==1', { 361 ['enable_touch_ui==1', {
(...skipping 15 matching lines...) Expand all
377 ], 377 ],
378 }, 378 },
379 ], 379 ],
380 }], 380 }],
381 ], # conditions 381 ], # conditions
382 }], # end OS != "mac" 382 }], # end OS != "mac"
383 ], # conditions 383 ], # conditions
384 }, 384 },
385 ], # targets 385 ], # targets
386 } 386 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698