diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-03 03:50:43 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-03 03:50:43 +0000 |
| commit | a28e330b65700730066cecffafecbb11742ede2c (patch) | |
| tree | ecd62d5761eee7dd3fc8902a476b8f66ec0f4f7e /tools/gritsettings | |
| parent | a9dfd3d2dac6bcca200e2930fa67ca8af4568f62 (diff) | |
| download | chromium_src-a28e330b65700730066cecffafecbb11742ede2c.zip chromium_src-a28e330b65700730066cecffafecbb11742ede2c.tar.gz chromium_src-a28e330b65700730066cecffafecbb11742ede2c.tar.bz2 | |
Revert 180282 (doesn't build without reverting r180071 too, so let's just
disable the test for now.)
> Revert 180055: Very likely caused http://crbug.com/173885
> > Moving chrome://tracing to content.
> >
> > BUG=169170
> > Review URL: https://codereview.chromium.org/12088099
>
> TBR=jam@chromium.org
> Review URL: https://codereview.chromium.org/12194007
TBR=thakis@chromium.org
Review URL: https://codereview.chromium.org/12197003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180285 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/gritsettings')
| -rw-r--r-- | tools/gritsettings/resource_ids | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids index 554ec0d..51e03b3 100644 --- a/tools/gritsettings/resource_ids +++ b/tools/gritsettings/resource_ids @@ -184,6 +184,7 @@ }, "content/content_resources.grd": { "includes": [25000], + "messages": [25250], }, "content/shell/shell_resources.grd": { "includes": [25500], |