summaryrefslogtreecommitdiff
path: root/chromium/tools/grit
Commit message (Collapse)AuthorAgeFilesLines
* <tools/grit> GRIT: Allow grd files outside of chromium source dir.Zeno Albisser2014-06-041-0/+6
| | | | | | | | | | | | | | | | | When replacing substrings with values from a dictionary, the replacements should not be truncated to the length of src_root_dir. If the basename does not exist as a key in the resource_ids file, then fall back to an absolute path. The precedence is like: file in chromium > file basename > absolute file name. THIS SHOULD BE UPSTREAMABLE. Change-Id: I7d1da8c04515807000742aac4a6fa4db7616fd13 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Update Chromium snapshot to stable version 33.0.1750.170Andras Becsi2014-06-041-6/+0
| | | | | | | | | | | | | | | This is meant as a baseline commit hence it does not include the patches we need to apply for QtWebEngine. All patches should be rebased on top of this commit so we can get rid of the external patches directory. In future these baseline commits always have to include the exact Chromium version returned by version_resolver.py's currentVersion() in their first line, so that we can retrieve the patches on top to apply on the upstream repository. This also includes a ninja update. Change-Id: I60abeadb785a3b7d149c58b65ddb5a823fed3083 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Update to new stable branch 1750Andras Becsi2014-03-2015-61/+354
| | | | | | | | | This also includes an updated ninja and chromium dependencies needed on Windows. Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42 Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Update Chromium to branch 1650 (31.0.1650.63)Andras Becsi2013-12-1369-6912/+232
| | | | | Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Initial import.Zeno Albisser2013-08-15217-0/+33120