diff options
| author | dzhioev <dzhioev@chromium.org> | 2015-07-10 20:14:29 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-11 03:15:08 +0000 |
| commit | 2ef4e14f1b6c9d59e29978e5a16baaedb3c22ab6 (patch) | |
| tree | a9b26713f1828a09e53030690eee969e97488e15 /components | |
| parent | 98a5676d4bfc93e9e2d92f3ee386205904cdf163 (diff) | |
| download | chromium_src-2ef4e14f1b6c9d59e29978e5a16baaedb3c22ab6.zip chromium_src-2ef4e14f1b6c9d59e29978e5a16baaedb3c22ab6.tar.gz chromium_src-2ef4e14f1b6c9d59e29978e5a16baaedb3c22ab6.tar.bz2 | |
Revert "Teach i18nTemplate.process() to handle <link rel=import> and <template>"
The reverted commit broke i18n-values substitution in OOBE UI.
This reverts commit b163dffbb26ab34a52a29e2dc8ccd00d0dbac431.
> Author: dbeam <dbeam@chromium.org>
> Date: Wed Jul 8 20:33:13 2015 -0700
>
> Teach i18nTemplate.process() to handle <link rel=import> and
> <template>
>
> This is required to support Polymerized web UI until we figure out
> a
> more flicker-resistant solution (see: crbug.com/506009)
>
> BUG=425626
> R=arv@chromium.org
> TBR=yoshiki@chromium.org
>
> Review URL: https://codereview.chromium.org/1229573003
>
> Cr-Commit-Position: refs/heads/master@{#337980}
BUG=425626,509087
TBR=dbeam
NOPRESUBIT=true
Review URL: https://codereview.chromium.org/1234753002
Cr-Commit-Position: refs/heads/master@{#338431}
Diffstat (limited to 'components')
| -rw-r--r-- | components/chrome_apps/webstore_widget/app/compiled_resources.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/chrome_apps/webstore_widget/app/compiled_resources.gyp b/components/chrome_apps/webstore_widget/app/compiled_resources.gyp index 2477d32..1fc7672 100644 --- a/components/chrome_apps/webstore_widget/app/compiled_resources.gyp +++ b/components/chrome_apps/webstore_widget/app/compiled_resources.gyp @@ -9,7 +9,7 @@ 'depends': [ '<@(cws_widget_container)', '../../../../third_party/jstemplate/compiled_resources.gyp:jstemplate', - '../../../../ui/webui/resources/js/compiled_resources.gyp:i18n_template_no_process', + '../../../../ui/webui/resources/js/i18n_template_no_process.js', '../../../../ui/webui/resources/js/load_time_data.js', ], 'externs': [ |