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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132760 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 1 deletions

diff --git a/ui/base/resource/resource_bundle_mac.mm b/ui/base/resource/resource_bundle_mac.mm
index 5ace3de..6e4002d 100644
--- a/ui/base/resource/resource_bundle_mac.mm
+++ b/ui/base/resource/resource_bundle_mac.mm
@@ -44,8 +44,18 @@ FilePath GetResourcesPakFilePath(NSString* name, NSString* mac_locale) {
 
 void ResourceBundle::LoadCommonResources() {
   AddDataPack(GetResourcesPakFilePath(@"chrome", nil));
-  if (base::mac::IsOSLionOrLater())
+  AddDataPack(GetResourcesPakFilePath(@"theme_resources_standard", nil));
+  AddDataPack(GetResourcesPakFilePath(@"ui_resources_standard", nil));
+
+  // On Windows and ChromeOS we load either the 1x resource or the 2x resource.
+  // On Mac we load both and let the UI framework decide which one to use.
+#if defined(ENABLE_HIDPI)
+  if (base::mac::IsOSLionOrLater()) {
     AddDataPack(GetResourcesPakFilePath(@"theme_resources_2x", nil));
+    AddDataPack(GetResourcesPakFilePath(@"theme_resources_standard_2x", nil));
+    AddDataPack(GetResourcesPakFilePath(@"ui_resources_standard_2x", nil));
+  }
+#endif
 }
 
 // static