diff options
| author | bryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-04 21:27:11 +0000 |
|---|---|---|
| committer | bryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-04 21:27:11 +0000 |
| commit | aee1dbdee8399a95bf2fcbbb6b78771ca5b83062 (patch) | |
| tree | 0d76443e57b7f6bb4f1b3af9426685c911083985 /chrome/chrome.gyp | |
| parent | cda15fd6409c4c39b98b1aced92279e513bc807c (diff) | |
| download | chromium_src-aee1dbdee8399a95bf2fcbbb6b78771ca5b83062.zip chromium_src-aee1dbdee8399a95bf2fcbbb6b78771ca5b83062.tar.gz chromium_src-aee1dbdee8399a95bf2fcbbb6b78771ca5b83062.tar.bz2 | |
This fixes resource loading for the virtual keyboard.
BUG=none
TEST=the keyboard no longer 404s in touchui builds
Review URL: http://codereview.chromium.org/5977007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70447 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index b58992af..2cd3079 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -59,7 +59,7 @@ # These resources end up in resources.pak because they are resources # used by internal pages. Putting them in a spearate pak file makes # it easier for us to reference them internally. - 'browser/resources/bookmark_manager_resources.grd', + 'browser/resources/component_extension_resources.grd', 'browser/resources/net_internals_resources.grd', 'browser/resources/shared_resources.grd' ], @@ -482,6 +482,9 @@ ['use_titlecase_in_grd_files==1', { 'action': ['-D', 'use_titlecase'], }], + ['touchui==1', { + 'action': ['-D', 'touchui'], + }], ], 'message': 'Generating resources from <(RULE_INPUT_PATH)', }, @@ -1542,7 +1545,7 @@ 'action_name': 'repack_resources', 'variables': { 'pak_inputs': [ - '<(grit_out_dir)/bookmark_manager_resources.pak', + '<(grit_out_dir)/component_extension_resources.pak', '<(grit_out_dir)/net_internals_resources.pak', '<(grit_out_dir)/shared_resources.pak', ], |