diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-17 19:50:06 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-17 19:50:06 +0000 |
| commit | 3481985be0789d7bd5cff1933fe92c94a3874f56 (patch) | |
| tree | f36f27d918bbabfccb53672d6a56bd9516540131 /build/ios | |
| parent | f1136b637102b206390e86b41bf78d73d9a87bf3 (diff) | |
| download | chromium_src-3481985be0789d7bd5cff1933fe92c94a3874f56.zip chromium_src-3481985be0789d7bd5cff1933fe92c94a3874f56.tar.gz chromium_src-3481985be0789d7bd5cff1933fe92c94a3874f56.tar.bz2 | |
Move the jstemplate resources back to common_resources.grd to fix test issues.
BUG=169170
Review URL: https://codereview.chromium.org/12001003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177458 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/ios')
| -rw-r--r-- | build/ios/grit_whitelist.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build/ios/grit_whitelist.txt b/build/ios/grit_whitelist.txt index 033e18a..2fa67bb 100644 --- a/build/ios/grit_whitelist.txt +++ b/build/ios/grit_whitelist.txt @@ -6,11 +6,15 @@ IDR_CRASHES_JS IDR_CREDITS_HTML IDR_DEFAULT_FAVICON IDR_DIR_HEADER_HTML +IDR_I18N_PROCESS_JS +IDR_I18N_TEMPLATE_JS +IDR_I18N_TEMPLATE2_JS IDR_INCOGNITO_TAB_HTML IDR_INFOBAR_AUTOLOGIN IDR_INFOBAR_RESTORE_SESSION IDR_INFOBAR_SAVE_PASSWORD IDR_INPUT_ALERT +IDR_JSTEMPLATE_JS IDR_NET_ERROR_HTML IDR_NET_INTERNALS_HELP_HTML IDR_NET_INTERNALS_HELP_JS @@ -55,10 +59,6 @@ IDR_UPDATE_BADGE4 IDR_UPDATE_MENU4 IDR_WEBUI_JS_LOAD_TIME_DATA IDR_WEBUI_JS_UTIL -IDR_WEBUI_JSTEMPLATE_JS -IDR_WEBUI_I18N_PROCESS_JS -IDR_WEBUI_I18N_TEMPLATE_JS -IDR_WEBUI_I18N_TEMPLATE2_JS IDR_WEBUI_IMAGES_SELECT IDS_ABOUT_MAC IDS_ABOUT_VERSION_COMMAND_LINE |