diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-19 23:18:22 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-19 23:18:22 +0000 |
| commit | abe92999c62ebc866b8a0451b3a1eb1d71e37391 (patch) | |
| tree | 3ead886a3c26bda2a80373ffde83b980941158ef /chrome/chrome_dll.gypi | |
| parent | a1d19d7439593f3bca7a0b4b8cc3be442a3c1272 (diff) | |
| download | chromium_src-abe92999c62ebc866b8a0451b3a1eb1d71e37391.zip chromium_src-abe92999c62ebc866b8a0451b3a1eb1d71e37391.tar.gz chromium_src-abe92999c62ebc866b8a0451b3a1eb1d71e37391.tar.bz2 | |
Add support for multi resolution icons
To support HiDPI we need a way to load two copies of icons, a low resolution version and a high resolution version.
To support this, this change does the following:
- split theme_resource.grd into three files:
- theme_resources.grd: icons that only have one resolution
- theme_resources_standard.grd: low resolution icons
- theme_resources_large.grd: high resolution icons
- theme_resource.grd and theme_resources_standard.grd and compiled into chrome.pak/chrome.rc for all platforms.
- theme_resources_large.grd is compiled into theme_resources_large.pak for platforms that want high resolution icons (currently only Mac)
- gfx::Image now support icons with multiple resolution
Currently not all ThemeService APIs return multi-resolution images. Once this is checked in I'll work on converting them as I go.
Note, this change will have to be coordinated with the change to reorganize theme resources. I'll work with saintlou on that.
BUG=75812
TEST=Added a TIFF to theme_resources.grd. Verified that the toolbar icon had a mutliresolution image. Verified that unit tests passed.
Review URL: http://codereview.chromium.org/6849030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82185 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_dll.gypi')
| -rw-r--r-- | chrome/chrome_dll.gypi | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index 46fd3ca..d200ad2 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -117,6 +117,7 @@ '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', @@ -321,6 +322,7 @@ '<(grit_out_dir)/default_plugin_resources/default_plugin_resources.pak', '<(grit_out_dir)/renderer_resources.pak', '<(grit_out_dir)/theme_resources.pak', + '<(grit_out_dir)/theme_resources_standard.pak', '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak', @@ -339,6 +341,24 @@ 'process_outputs_as_mac_bundle_resources': 1, }, { + 'action_name': 'repack_theme_resources_large', + 'variables': { + 'pak_inputs': [ + '<(grit_out_dir)/theme_resources_large.pak', + ], + }, + 'inputs': [ + '<(repack_path)', + '<@(pak_inputs)', + ], + 'outputs': [ + '<(INTERMEDIATE_DIR)/repack/theme_resources_large.pak', + ], + 'action': ['python', '<(repack_path)', '<@(_outputs)', + '<@(pak_inputs)'], + 'process_outputs_as_mac_bundle_resources': 1, + }, + { 'action_name': 'repack_locales', 'process_outputs_as_mac_bundle_resources': 1, 'variables': { |