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

ui/gfx/canvas.h

 // 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.
 
 #ifndef UI_GFX_CANVAS_H_
 #define UI_GFX_CANVAS_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 178 matching lines @@
   // Adds |path| to the current clip. Returns true if the resulting clip is
   // non-empty.
   bool ClipPath(const SkPath& path);
 
   // Returns the bounds of the current clip (in local coordinates) in the
   // |bounds| parameter, and returns true if it is non empty.
   bool GetClipBounds(gfx::Rect* bounds);
 
   void Translate(const gfx::Vector2d& offset);
 
+#if defined(ENABLE_HIDPI)
+  void Scale(double x_scale, double y_scale);
+#else
   void Scale(int x_scale, int y_scale);
+#endif
 
   // Fills the entire canvas' bitmap (restricted to current clip) with
   // specified |color| using a transfer mode of SkXfermode::kSrcOver_Mode.
   void DrawColor(SkColor color);
 
   // Fills the entire canvas' bitmap (restricted to current clip) with
   // specified |color| and |mode|.
   void DrawColor(SkColor color, SkXfermode::Mode mode);
 
   // Fills |rect| with |color| using a transfer mode of
@@ skipping 191 matching lines @@
 
   skia::RefPtr<skia::PlatformCanvas> owned_canvas_;
   SkCanvas* canvas_;
 
   DISALLOW_COPY_AND_ASSIGN(Canvas);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_CANVAS_H_