Make elevation icon size correct in different DPI settings

chrome/browser/ui/views/elevation_icon_setter.cc

 // Copyright 2014 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 "chrome/browser/ui/views/elevation_icon_setter.h"
 
 #include "base/task_runner_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/views/controls/button/label_button.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #include "base/win/win_util.h"
 #include "base/win/windows_version.h"
 #include "ui/gfx/icon_util.h"
+#include "ui/gfx/win/dpi.h"
 #endif
 
 
 // Helpers --------------------------------------------------------------------
 
 namespace {
 
 scoped_ptr<SkBitmap> GetElevationIcon() {
   scoped_ptr<SkBitmap> icon;
 #if defined(OS_WIN)
@@ skipping 37 matching lines @@
       base::Bind(&GetElevationIcon),
       base::Bind(&ElevationIconSetter::SetButtonIcon,
                  weak_factory_.GetWeakPtr()));
 }
 
 ElevationIconSetter::~ElevationIconSetter() {
 }
 
 void ElevationIconSetter::SetButtonIcon(scoped_ptr<SkBitmap> icon) {
   if (icon) {
-    button_->SetImage(views::Button::STATE_NORMAL,
-                      gfx::ImageSkia::CreateFrom1xBitmap(*icon));
+    float device_scale_factor = 1.0f;
+#if defined(OS_WIN)
+    // Windows gives us back a correctly-scaled image for the current DPI, so
+    // mark this image as having been scaled for the current DPI already.
+    device_scale_factor = gfx::GetDPIScale();
+#endif
+    button_->SetImage(
+        views::Button::STATE_NORMAL,
+        gfx::ImageSkia(gfx::ImageSkiaRep(*icon, device_scale_factor)));
     button_->SizeToPreferredSize();
     if (button_->parent())
       button_->parent()->Layout();
   }
 }