diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-17 02:12:11 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-17 02:12:11 +0000 |
| commit | 2e317bffec137548f6240fff37b70b5f4b372740 (patch) | |
| tree | 3db7b06819fcd1e729530a801dccaa74653a2644 /build | |
| parent | 83d9dc34879eb006cb7f3ba53f0e6ec5e24772a9 (diff) | |
| download | chromium_src-2e317bffec137548f6240fff37b70b5f4b372740.zip chromium_src-2e317bffec137548f6240fff37b70b5f4b372740.tar.gz chromium_src-2e317bffec137548f6240fff37b70b5f4b372740.tar.bz2 | |
Metro/HiDPI: Move 1x icons into separate pak file
Currently all 1x art files are repacked into chrome.pak files.
This is a problem on Windows where we want to choose which pak file to load based on metro and DPI scale.
As a first step this CL does the following:
- add a new enable_hidpi build flag. This allows us to test HiDPI mode on Windows Chrome.
- stop packing theme_resources_standard.pak and ui_resources_standard.pak into chrome.pak
- update the Mac and Windows installer code to package the extra pak files.
Note, I'll be updating the Linux installer script in a separate CL. I'm still looking into the ChromeOS situation.
BUG=114311
TEST=Ran on Windows, and Mac and Linux.
Review URL: http://codereview.chromium.org/10024050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132517 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi index 7001af3..7b591ff 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -40,6 +40,9 @@ # Disable viewport meta tag by default. 'enable_viewport%': 0, + + # Enable HiDPI support. + 'enable_hidpi%': 0, }, # Copy conditionally-set variables out one scope. 'chromeos%': '<(chromeos)', @@ -49,6 +52,7 @@ 'use_openssl%': '<(use_openssl)', 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 'enable_viewport%': '<(enable_viewport)', + 'enable_hidpi%': '<(enable_hidpi)', # Compute the architecture that we're building on. 'conditions': [ @@ -82,6 +86,11 @@ }, { 'toolkit_views%': 0, }], + + # Enable HiDPI on Mac OS. + ['OS=="mac"', { + 'enable_hidpi%': 1, + }], ], }, @@ -95,6 +104,7 @@ 'use_openssl%': '<(use_openssl)', 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 'enable_viewport%': '<(enable_viewport)', + 'enable_hidpi%': '<(enable_hidpi)', # We used to provide a variable for changing how libraries were built. # This variable remains until we can clean up all the users. @@ -490,6 +500,7 @@ 'chromeos%': '<(chromeos)', 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 'enable_viewport%': '<(enable_viewport)', + 'enable_hidpi%': '<(enable_hidpi)', 'use_xi2_mt%':'<(use_xi2_mt)', 'file_manager_extension%': '<(file_manager_extension)', 'webui_task_manager%': '<(webui_task_manager)', @@ -1285,6 +1296,9 @@ ['notifications==1', { 'defines': ['ENABLE_NOTIFICATIONS'], }], + ['enable_hidpi==1', { + 'defines': ['ENABLE_HIDPI=1'], + }], ['fastbuild!=0', { 'conditions': [ |