[Mac] Use full icon for small Chrome Apps custom folder assets

chrome/browser/web_applications/web_app_mac.mm

 // Copyright (c) 2012 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.
 
 #import "chrome/browser/web_applications/web_app_mac.h"
 
 #import <Carbon/Carbon.h>
 #import <Cocoa/Cocoa.h>
 
 #include "apps/app_shim/app_shim_mac.h"
@@ skipping 280 matching lines @@
   [overlay drawInRect:NSMakeRect(0, 0, dimension, dimension)
              fromRect:NSZeroRect
             operation:NSCompositeSourceOver
              fraction:1.0
        respectFlipped:NO
                 hints:0];
   [NSGraphicsContext restoreGraphicsState];
   return canvas.autorelease();
 }
 
+// Helper function to extract the single NSImageRep held in a resource bundle
+// image.
+NSImageRep* ImageRepForResource(int resource_id) {
+  gfx::Image& image =
+      ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id);
+  NSArray* image_reps = [image.AsNSImage() representations];
+  DCHECK_EQ(1u, [image_reps count]);
+  return [image_reps objectAtIndex:0];
+}
+
 // Adds a localized strings file for the Chrome Apps directory using the current
 // locale. OSX will use this for the display name.
 // + Chrome Apps.localized (|apps_directory|)
 // | + .localized
 // | | en.strings
 // | | de.strings
 void UpdateAppShortcutsSubdirLocalizedName(
     const base::FilePath& apps_directory) {
   base::FilePath localized = apps_directory.Append(".localized");
   if (!base::CreateDirectory(localized))
     return;
 
   base::FilePath directory_name = apps_directory.BaseName().RemoveExtension();
   base::string16 localized_name = ShellIntegration::GetAppShortcutsSubdirName();
   NSDictionary* strings_dict = @{
       base::mac::FilePathToNSString(directory_name) :
           base::SysUTF16ToNSString(localized_name)
   };
 
   std::string locale = l10n_util::NormalizeLocale(
       l10n_util::GetApplicationLocale(std::string()));
 
   NSString* strings_path = base::mac::FilePathToNSString(
       localized.Append(locale + ".strings"));
   [strings_dict writeToFile:strings_path
                  atomically:YES];
 
-  // Brand the folder with an embossed app launcher logo.
+  base::scoped_nsobject<NSImage> folder_icon_image([[NSImage alloc] init]);
+
+  // Use complete assets for the small icon sizes. -[NSWorkspace setIcon:] has a
+  // bug when dealing with named NSImages where it incorrectly handles alpha
+  // premultiplication. This is most noticable with small assets since the 1px
+  // border is a much larger component of the small icons.
+  // See http://crbug.com/305373 for details.
+  [folder_icon_image addRepresentation:ImageRepForResource(IDR_APPS_FOLDER_16)];
+  [folder_icon_image addRepresentation:ImageRepForResource(IDR_APPS_FOLDER_32)];
+
+  // Brand larger folder assets with an embossed app launcher logo to conserve
+  // distro size and for better consistency with changing hue across OSX
+  // versions. The folder is textured, so compresses poorly without this.
   const int kBrandResourceIds[] = {
-    IDR_APPS_FOLDER_OVERLAY_16,
-    IDR_APPS_FOLDER_OVERLAY_32,
     IDR_APPS_FOLDER_OVERLAY_128,
     IDR_APPS_FOLDER_OVERLAY_512,
   };
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   NSImage* base_image = [NSImage imageNamed:NSImageNameFolder];
-  base::scoped_nsobject<NSImage> folder_icon_image([[NSImage alloc] init]);
   for (size_t i = 0; i < arraysize(kBrandResourceIds); ++i) {
-    gfx::Image& image_rep = rb.GetNativeImageNamed(kBrandResourceIds[i]);
-    NSArray* image_reps = [image_rep.AsNSImage() representations];
-    DCHECK_EQ(1u, [image_reps count]);
-    NSImageRep* with_overlay = OverlayImageRep(base_image,
-                                               [image_reps objectAtIndex:0]);
+    NSImageRep* with_overlay =
+        OverlayImageRep(base_image, ImageRepForResource(kBrandResourceIds[i]));
     DCHECK(with_overlay);
     if (with_overlay)
       [folder_icon_image addRepresentation:with_overlay];
   }
   [[NSWorkspace sharedWorkspace]
       setIcon:folder_icon_image
       forFile:base::mac::FilePathToNSString(apps_directory)
       options:0];
 }
 
@@ skipping 609 matching lines @@
   web_app::UpdateShortcutInfoAndIconForApp(
       app,
       profile,
       base::Bind(&web_app::CreateAppShortcutInfoLoaded,
                  profile,
                  app,
                  close_callback));
 }
 
 }  // namespace chrome