(Not ready for review!) Toolbar and views high dpi support.

ui/views/controls/button/image_button.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/views/controls/button/image_button.h"
 
 #include "base/utf_string_conversions.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia_operations.h"
@@ skipping 56 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // ImageButton, View overrides:
 
 gfx::Size ImageButton::GetPreferredSize() {
   if (!images_[STATE_NORMAL].isNull()) {
     return gfx::Size(images_[STATE_NORMAL].width(),
                      images_[STATE_NORMAL].height());
   }
   return preferred_size_;
 }
+static float GetScaleFactor() {
+  switch (ui::GetMaxScaleFactor()) {
+  case ui::SCALE_FACTOR_140P:
+    return 1.4f;
+  case ui::SCALE_FACTOR_180P:
+    return 1.8f;
+  }
+  return 1.0f;
+}
 
 void ImageButton::OnPaint(gfx::Canvas* canvas) {
   // Call the base class first to paint any background/borders.
   View::OnPaint(canvas);
 
   gfx::ImageSkia img = GetImageToPaint();
 
   if (!img.isNull()) {
     gfx::Point position = ComputeImagePaintPosition(img);
+    static float scale = GetScaleFactor();
+    scale = 1;
+    // TODO: store and reset the transform.... this implementation will accumulate errors.
+    canvas->Scale( scale, scale);
     if (!background_image_.isNull())
       canvas->DrawImageInt(background_image_, position.x(), position.y());
 
-    canvas->DrawImageInt(img, position.x(), position.y());
+    canvas->DrawImageInt(img, 0, 0);//position.x(), position.y());
 
     if (!overlay_image_.isNull())
       canvas->DrawImageInt(overlay_image_, position.x(), position.y());
+    canvas->Scale( 1/scale, 1/scale);
   }
   OnPaintFocusBorder(canvas);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ImageButton, protected:
 
 gfx::ImageSkia ImageButton::GetImageToPaint() {
   gfx::ImageSkia img;
 
@@ skipping 90 matching lines @@
 bool ToggleImageButton::GetTooltipText(const gfx::Point& p,
                                        string16* tooltip) const {
   if (!toggled_ || toggled_tooltip_text_.empty())
     return Button::GetTooltipText(p, tooltip);
 
   *tooltip = toggled_tooltip_text_;
   return true;
 }
 
 }  // namespace views