diff options
| author | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-18 17:03:42 +0000 |
|---|---|---|
| committer | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-18 17:03:42 +0000 |
| commit | eb2e2f4495e44ed811633b436918cca114d2d073 (patch) | |
| tree | 495ceeddea60c57e64efce4da363572954c238be /build | |
| parent | 7610eabddaacd72ea8045c777df1755eca4ef79e (diff) | |
| download | chromium_src-eb2e2f4495e44ed811633b436918cca114d2d073.zip chromium_src-eb2e2f4495e44ed811633b436918cca114d2d073.tar.gz chromium_src-eb2e2f4495e44ed811633b436918cca114d2d073.tar.bz2 | |
Revert 132760 - 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.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=132517
Review URL: http://codereview.chromium.org/10024050
TBR=sail@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10115031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132804 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/build/common.gypi b/build/common.gypi index 7b591ff..7001af3 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -40,9 +40,6 @@ # Disable viewport meta tag by default. 'enable_viewport%': 0, - - # Enable HiDPI support. - 'enable_hidpi%': 0, }, # Copy conditionally-set variables out one scope. 'chromeos%': '<(chromeos)', @@ -52,7 +49,6 @@ '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': [ @@ -86,11 +82,6 @@ }, { 'toolkit_views%': 0, }], - - # Enable HiDPI on Mac OS. - ['OS=="mac"', { - 'enable_hidpi%': 1, - }], ], }, @@ -104,7 +95,6 @@ '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. @@ -500,7 +490,6 @@ '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)', @@ -1296,9 +1285,6 @@ ['notifications==1', { 'defines': ['ENABLE_NOTIFICATIONS'], }], - ['enable_hidpi==1', { - 'defines': ['ENABLE_HIDPI=1'], - }], ['fastbuild!=0', { 'conditions': [ |