diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-21 20:15:05 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-21 20:15:05 +0000 |
| commit | fac33c9d24bf0fda992a525b3ca8dde46ce81b2e (patch) | |
| tree | 2589894fc8f1332e16232a0bd9a3099c202478f3 /tools | |
| parent | 1f05a953388ce26cb54a875848abf3469d381813 (diff) | |
| download | chromium_src-fac33c9d24bf0fda992a525b3ca8dde46ce81b2e.zip chromium_src-fac33c9d24bf0fda992a525b3ca8dde46ce81b2e.tar.gz chromium_src-fac33c9d24bf0fda992a525b3ca8dde46ce81b2e.tar.bz2 | |
Merge 82352 - Revert high res icon changesThe new high res icon change may have caused a perf regression. To verify I'm reverting the following chnages: commit 3a360c6b3d2fc174cb7597d6365cfc5418d1442b r82326 Disable loading high res icons on Mac commit 3c39226937a39d0042b8a794f13505c7a25ca58b r82247 Fix reload button unit test commit f87ab117fc159566868e71e4df5672852bebd718 r82245 Unregister toolbar view from window notifications commit 0b287ba4a4ad5c19d901f973eb9af594dcf3dba1 r82239 Fix failing Mac unit tests commit 8b681c46a139d12151323952c58122f6805d7597 r82236 Mac: Remove custom drawn buttons commit 6ae8a2fe40485731b86267e362936db16b4c0706 r82209 Fix clang build break commit e8a19d1e0c76f204c834318566e4206320583449 r82185 Add support for multi resolution iconsBUG=NoneTEST=ComplingReview URL: http://codereview.chromium.org/6878077
TBR=sail@chromium.org
Review URL: http://codereview.chromium.org/6881114
git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@82542 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -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], - }, + } } |