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

3 files changed, 5 insertions, 32 deletions

diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg
index 60fe243..2c21743 100644
--- a/chrome/tools/build/win/FILES.cfg
+++ b/chrome/tools/build/win/FILES.cfg
@@ -347,26 +347,6 @@ FILES = [
     'buildtype': ['dev', 'official'],
   },
   {
-    'filename': 'theme_resources_standard.pak',
-    'arch': ['32bit', '64bit'],
-    'buildtype': ['dev', 'official'],
-  },
-  {
-    'filename': 'theme_resources_2x.pak',
-    'arch': ['32bit', '64bit'],
-    'buildtype': ['dev', 'official'],
-  },
-  {
-    'filename': 'ui_resources_standard.pak',
-    'arch': ['32bit', '64bit'],
-    'buildtype': ['dev', 'official'],
-  },
-  {
-    'filename': 'ui_resources_2x.pak',
-    'arch': ['32bit', '64bit'],
-    'buildtype': ['dev', 'official'],
-  },
-  {
     'filename': 'wow_helper.exe',
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
diff --git a/chrome/tools/build/win/create_installer_archive.py b/chrome/tools/build/win/create_installer_archive.py
index 25b2972..a7adbba 100755
--- a/chrome/tools/build/win/create_installer_archive.py
+++ b/chrome/tools/build/win/create_installer_archive.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -89,8 +89,7 @@ def CompressUsingLZMA(build_dir, compressed_file, input_file):
   RunSystemCommand(cmd)
 
 
-def CopyAllFilesToStagingDir(config, distribution, staging_dir, build_dir,
-                             enable_hidpi):
+def CopyAllFilesToStagingDir(config, distribution, staging_dir, build_dir):
   """Copies the files required for installer archive.
   Copies all common files required for various distributions of Chromium and
   also files for the specific Chromium build specified by distribution.
@@ -101,8 +100,6 @@ def CopyAllFilesToStagingDir(config, distribution, staging_dir, build_dir,
       distribution = distribution[1:]
     CopySectionFilesToStagingDir(config, distribution.upper(),
                                  staging_dir, build_dir)
-  if enable_hidpi == '1':
-    CopySectionFilesToStagingDir(config, 'HIDPI', staging_dir, build_dir)
 
 
 def CopySectionFilesToStagingDir(config, section, staging_dir, build_dir):
@@ -327,13 +324,11 @@ def main(options):
   # building the optimized mini_installer.
   if options.build_dir != options.output_dir:
     CopyAllFilesToStagingDir(config, options.distribution,
-                             staging_dir, options.output_dir,
-                             options.enable_hidpi)
+                             staging_dir, options.output_dir)
 
   # Now copy the remainder of the files from the build dir.
   CopyAllFilesToStagingDir(config, options.distribution,
-                           staging_dir, options.build_dir,
-                           options.enable_hidpi)
+                           staging_dir, options.build_dir)
 
   version_numbers = current_version.split('.')
   current_build_number = version_numbers[2] + '.' + version_numbers[3]
@@ -385,8 +380,6 @@ def _ParseOptions():
            '{BSDIFF|COURGETTE}.')
   parser.add_option('-n', '--output_name', default='chrome',
       help='Name used to prefix names of generated archives.')
-  parser.add_option('--enable_hidpi', default='0',
-      help='Whether to include HiDPI resource files.')
 
   options, args = parser.parse_args()
   if not options.build_dir:
diff --git a/chrome/tools/build/win/release.rules b/chrome/tools/build/win/release.rules
index cd3212b..21cdf14 100644
--- a/chrome/tools/build/win/release.rules
+++ b/chrome/tools/build/win/release.rules
@@ -7,7 +7,7 @@
 		<CustomBuildRule
 			Name="Create Installer Archive"
 			DisplayName="Create Installer Archive"
-			CommandLine="$(SolutionDir)..\third_party\python_24\python.exe $(SolutionDir)tools\build\win\create_installer_archive.py --output_dir=&quot;$(OutDir)&quot; --input_file=&quot;$(InputPath)&quot; --distribution=$(CHROMIUM_BUILD) --enable_hidpi=$(ENABLE_HIDPI) [LastChromeInstaller] [SkipRebuildArchive] [SetupExeFormat] [DiffAlgorithm]"
+			CommandLine="$(SolutionDir)..\third_party\python_24\python.exe $(SolutionDir)tools\build\win\create_installer_archive.py --output_dir=&quot;$(OutDir)&quot; --input_file=&quot;$(InputPath)&quot; --distribution=$(CHROMIUM_BUILD) [LastChromeInstaller] [SkipRebuildArchive] [SetupExeFormat] [DiffAlgorithm]"
 			Outputs="$(OutDir)/$(InputName).7z;$(OutDir)/$(InputName).packed.7z;$(OutDir)/setup.ex_;$(OutDir)/packed_files.txt;"
 			AdditionalDependencies="$(SolutionDir)\tools\build\win\create_installer_archive.py;$(OutDir)\chrome.exe;$(OutDir)\crash_reporter.exe;$(OutDir)\chrome.dll;$(OutDir)\locales\en-US.dll;$(OutDir)\icudt38.dll"
 			FileExtensions="*.release"