diff options
author | tfarina <tfarina@chromium.org> | 2014-09-03 16:36:19 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-03 23:39:43 +0000 |
commit | f71b9f862b84c1629fb9b278cd373523750ca3d5 (patch) | |
tree | c80d69983e6ffe64b558dd5e0925502afbad4e8b /ui/base/resource | |
parent | ba7e0499e10b1c65ead54148a7582e0c60be6c6d (diff) | |
download | chromium_src-f71b9f862b84c1629fb9b278cd373523750ca3d5.zip chromium_src-f71b9f862b84c1629fb9b278cd373523750ca3d5.tar.gz chromium_src-f71b9f862b84c1629fb9b278cd373523750ca3d5.tar.bz2 |
ui: No need to add content resources paks in ResourceBundle Mac port.
Test plan:
First: download chrome-mac.zip from https://download-chromium.appspot.com/?platform=Mac
Then:
$ unzip chrome-mac.zip
$ cd chrome-mac
$ find . -name "*.pak" | grep chrome
./Chromium.app/Contents/Versions/39.0.2136.0/Chromium Framework.framework/Resources/chrome_200_percent.pak
./Chromium.app/Contents/Versions/39.0.2136.0/Chromium Framework.framework/Resources/chrome_100_percent.pak
$ find . | grep content
0 # no results
Check with python:
$ cd ~/chromium/src/tools/grit
$ python
>>> from grit.format import data_pack
>>> pack = data_pack.ReadDataPack('
~/Download/chrome-mac/Chromium.app/Contents/Versions/39.0.2136.0/Chromium
Framework.framework/Resources/chrome_100_percent.pak')
>>> pack.resources[4700]
>>>'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x0e\x00\x00\x00\x10\x08\x06\x00\x00\x00&\x94N:\x00\x00\x01\x87IDAT(S\x8d\x90I/CQ\x18\x86\xbf\xb5_\x84\xa5\x84\x9f6XX\xb3\xb0\xb7"$j\xe8\xc05T\xe7\x95H\x8cM\xec\xc4XA\xd5\x90\xe2VU\x1a\xa5\x86xb8\xb4h\xaf\xd7\xf9\x0e\xb7Q\xb9\xa2o\xf2,\xce9\xcf\xb39\x14\x08\x04P\nDTF?\xe7\xf7\x07\xa0e?\xf0\x981\xe7)\xa3CQ\x14\xb0W\x14\xfb|~\x9c\xdf\xe98N\xe7LI\xde\xbc\xcb\x90\xc7n!\xf6z\xbd8\xb9\xd6\x119}\x93\x183\xcej\xea\xb5\x10\xf2\xd8\x97\xb1\xdb\xedA\xfcJ\xc7v\xe2\x15\xbf\xc7wG"\xb4\xd9lEpC.\x97[\x86f\xdb\x8ag\x11\x89k\xb8\xb8\xcb\xe1^\xcbK\xf8?\xb8!\xa7s\x0c\xf1K\x1d\x1b\xc7/\xa6\x84O2\xd8Ofqp\xf6E\xeaV\x0774:\xeaD,\x9dGH}.\tv\xb9\xa1\xe1\xe1\x11\xa8\xe2\xb0v\xa8\x95\x04\xbb\xa2!R\x94!\xa8\x17y\xacD\xb5\x02\xcb\xd1G\xccD\xa2\x08\xee\xc4\x8a\xee\x19\xe1rC48\xa8\xe0H\x84\x8b{\x0f\x12Oh\x1e\xb5\xe3\xe5\xa8\x9b\xac\x904\xcf5b6\xac\x1a\xef$\\n\x88\x1c\x8e\x01\x1c\x9e\xe7\xb1\xb0\xfb\x00\xdb\x92W\xc8\x95\x85\xc8\xa0~\xb2\n\x13\x9b\x11\x12\x0e\tW6d\xb7;d\xe8Z\r\x9aF\xdfP\xc3T5\xcd\x85\x13\x1c\x82\x1b\xb2Z\xedXO\xa4\xd18]\xf3gd\xd0\x12lB4\xf5\x0en\xa8\xbf\xdf\x8a\xb6\x85\xd6\x7f#\xe3\xaew\xad\x07\xbd\xd6>Pgg\x17\xda\xdb;\xcc\xa0\x1f\x14\xbdu[,\xf8\x04*e\x8e;5\xb6\x8b\x00\x00\x00\x00IEND\xaeB`\x82'
NOTE: 4700 is the ID of IDR_BROKENIMAGE defined in
out/Debug/gen/content/app/resources/grit/content_resources.h, which
shows content_resources_100_percent.pak gets included within
chrome_100_percent.pak
BUG=176960
TEST=see test plan above
R=tony@chromium.org
Review URL: https://codereview.chromium.org/521473002
Cr-Commit-Position: refs/heads/master@{#293219}
Diffstat (limited to 'ui/base/resource')
-rw-r--r-- | ui/base/resource/resource_bundle_mac.mm | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/ui/base/resource/resource_bundle_mac.mm b/ui/base/resource/resource_bundle_mac.mm index 6ad6b1a..2863e08 100644 --- a/ui/base/resource/resource_bundle_mac.mm +++ b/ui/base/resource/resource_bundle_mac.mm @@ -51,17 +51,12 @@ base::FilePath GetResourcesPakFilePath(NSString* name, NSString* mac_locale) { void ResourceBundle::LoadCommonResources() { AddDataPackFromPath(GetResourcesPakFilePath(@"chrome_100_percent", nil), SCALE_FACTOR_100P); - AddDataPackFromPath(GetResourcesPakFilePath(@"content_resources_100_percent", - nil), SCALE_FACTOR_100P); // On Mac we load 1x and 2x resources and we let the UI framework decide // which one to use. if (IsScaleFactorSupported(SCALE_FACTOR_200P)) { AddDataPackFromPath(GetResourcesPakFilePath(@"chrome_200_percent", nil), SCALE_FACTOR_200P); - AddDataPackFromPath( - GetResourcesPakFilePath(@"content_resources_200_percent", nil), - SCALE_FACTOR_200P); } } |