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

Side by Side Diff: chrome/chrome_dll.gypi

Issue 10701105: Update webkit_resources to support high-dpi assets (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Change resource_bundle_mac.mm to load webkit_resources* on Mac as for other platforms 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 | « no previous file | chrome/chrome_resources.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 'conditions': [ 5 'conditions': [
6 ['OS=="mac" or OS=="win"', { 6 ['OS=="mac" or OS=="win"', {
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'chrome_dll', 9 'target_name': 'chrome_dll',
10 'type': 'none', 10 'type': 'none',
(...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after
527 }], # mac_keystone 527 }], # mac_keystone
528 ['internal_pdf', { 528 ['internal_pdf', {
529 'dependencies': [ 529 'dependencies': [
530 '../pdf/pdf.gyp:pdf', 530 '../pdf/pdf.gyp:pdf',
531 ], 531 ],
532 }], 532 }],
533 ['enable_hidpi==1', { 533 ['enable_hidpi==1', {
534 'mac_bundle_resources': [ 534 'mac_bundle_resources': [
535 '<(grit_out_dir)/theme_resources_200_percent.pak', 535 '<(grit_out_dir)/theme_resources_200_percent.pak',
536 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_200 _percent.pak', 536 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_200 _percent.pak',
537 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_200_perc ent.pak',
537 ], 538 ],
538 }], 539 }],
539 ], # conditions 540 ], # conditions
540 }], # OS=="mac" 541 }], # OS=="mac"
541 ], # conditions 542 ], # conditions
542 }, # target chrome_dll 543 }, # target chrome_dll
543 ], # targets 544 ], # targets
544 }], # OS=="mac" or OS=="win" 545 }], # OS=="mac" or OS=="win"
545 ], 546 ],
546 } 547 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_resources.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698