diff options
Diffstat (limited to 'tools/grit')
| -rw-r--r-- | tools/grit/grit/format/resource_map.py | 4 | ||||
| -rw-r--r-- | tools/grit/resource_ids | 9 |
2 files changed, 1 insertions, 12 deletions
diff --git a/tools/grit/grit/format/resource_map.py b/tools/grit/grit/format/resource_map.py index 4527af8..5ae135b 100644 --- a/tools/grit/grit/format/resource_map.py +++ b/tools/grit/grit/format/resource_map.py @@ -49,14 +49,10 @@ class HeaderTopLevel(interface.ItemFormatter): #include <stddef.h> -#ifndef GRIT_RESOURCE_MAP_STRUCT_ -#define GRIT_RESOURCE_MAP_STRUCT_ struct GritResourceMap { const char* const name; int value; }; -#endif // GRIT_RESOURCE_MAP_STRUCT_ - extern const GritResourceMap %(map_name)s[]; extern const size_t %(map_name)sSize; ''' % { 'year': util.GetCurrentYear(), diff --git a/tools/grit/resource_ids b/tools/grit/resource_ids index c871600..b89b95de 100644 --- a/tools/grit/resource_ids +++ b/tools/grit/resource_ids @@ -130,12 +130,5 @@ # This file is generated during the build. "<(SHARED_INTERMEDIATE_DIR)/devtools/devtools_resources.grd": { "includes": [20500], - }, - # All standard and large theme resources should have the same IDs. - "chrome/app/theme/theme_resources_standard.grd": { - "includes": [21000], - }, - "chrome/app/theme/theme_resources_large.grd": { - "includes": [21000], - }, + } } |