Change browser/page action default icon defined in manifest to support hidpi.

ui/gfx/image/image_skia_operations.cc

 // 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.
 
 #include "ui/gfx/image/image_skia_operations.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "skia/ext/image_operations.h"
 #include "skia/ext/platform_canvas.h"
@@ skipping 87 matching lines @@
       : gfx::CanvasImageSource(first.size(), false /* is opaque */),
         first_(first),
         second_(second) {
   }
 
   virtual ~SuperimposedImageSource() {}
 
   // gfx::CanvasImageSource override.
   virtual void Draw(Canvas* canvas) OVERRIDE {
     canvas->DrawImageInt(first_, 0, 0);
+LOG(ERROR) << second_.width();
     canvas->DrawImageInt(second_,
                          (first_.width() - second_.width()) / 2,
                          (first_.height() - second_.height()) / 2);
   }
 
  private:
   const ImageSkia first_;
   const ImageSkia second_;
 
   DISALLOW_COPY_AND_ASSIGN(SuperimposedImageSource);
 };
 
 class TransparentImageSource : public gfx::ImageSkiaSource {
  public:
   TransparentImageSource(const ImageSkia& image, double alpha)
       : image_(image),
         alpha_(alpha) {
   }
 
   virtual ~TransparentImageSource() {}
 
  private:
   // gfx::ImageSkiaSource overrides:
   virtual ImageSkiaRep GetImageForScale(ui::ScaleFactor scale_factor) OVERRIDE {
     ImageSkiaRep image_rep = image_.GetRepresentation(scale_factor);
     SkBitmap alpha;
-    const float scale = ui::GetScaleFactorScale(image_rep.scale_factor());
     alpha.setConfig(SkBitmap::kARGB_8888_Config,
-                    static_cast<int>(image_.size().width() * scale),
-                    static_cast<int>(image_.size().height() * scale));
+                    static_cast<int>(image_rep.sk_bitmap().width()),
+                    static_cast<int>(image_rep.sk_bitmap().height()));
     alpha.allocPixels();
     alpha.eraseColor(SkColorSetARGB(alpha_ * 256, 0, 0, 0));
-    return ImageSkiaRep(SkBitmapOperations::CreateMaskedBitmap(
-        image_rep.sk_bitmap(), alpha),
-                        image_rep.scale_factor());
+    return ImageSkiaRep(
+        SkBitmapOperations::CreateMaskedBitmap(image_rep.sk_bitmap(), alpha),
+        image_rep.scale_factor());
   }
 
   ImageSkia image_;
   double alpha_;
 
   DISALLOW_COPY_AND_ASSIGN(TransparentImageSource);
 };
 
 class MaskedImageSource : public gfx::ImageSkiaSource {
  public:
@@ skipping 297 matching lines @@
     const ImageSkia& source,
     const ShadowValues& shadows) {
   const gfx::Insets shadow_padding = -gfx::ShadowValue::GetMargin(shadows);
   gfx::Size shadow_image_size = source.size();
   shadow_image_size.Enlarge(shadow_padding.width(),
                             shadow_padding.height());
   return ImageSkia(new DropShadowSource(source, shadows), shadow_image_size);
 }
 
 }  // namespace gfx