From a28e330b65700730066cecffafecbb11742ede2c Mon Sep 17 00:00:00 2001 From: "thakis@chromium.org" Date: Sun, 3 Feb 2013 03:50:43 +0000 Subject: 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 --- tools/gritsettings/resource_ids | 1 + 1 file changed, 1 insertion(+) (limited to 'tools/gritsettings') 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], -- cgit v1.1