ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia.

ui/views/view_text_utils.h

Index: ui/views/view_text_utils.h
diff --git a/ui/views/view_text_utils.h b/ui/views/view_text_utils.h
index c0141a586b164cfdef539b1e8e23dc1f14e8366a..ac4dff423b39e58e4c6e5a3abbf4bc6b95db450c 100644
--- a/ui/views/view_text_utils.h
+++ b/ui/views/view_text_utils.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -10,7 +10,7 @@
 #include "ui/views/views_export.h"
 
 namespace gfx {
-class Canvas;
+class CanvasSkia;
 class Font;
 class Rect;
 class Size;
@@ -39,7 +39,7 @@ namespace view_text_utils {
 // NOTE: The reason why we need this function is because while Skia knows how
 // to wrap text appropriately, it doesn't tell us where it drew the last
 // character, which we need to position the URLs within the text.
-VIEWS_EXPORT void DrawTextAndPositionUrl(gfx::Canvas* canvas,
+VIEWS_EXPORT void DrawTextAndPositionUrl(gfx::CanvasSkia* canvas,
                                          views::Label* label,
                                          const string16& text,
                                          views::Link* link,
@@ -54,7 +54,7 @@ VIEWS_EXPORT void DrawTextAndPositionUrl(gfx::Canvas* canvas,
 // |word_for_word| specifies whether to draw the text word for word or whether
 // to treat the text as one blurb (similar to the way URL's are treated inside
 // RTL text. For details on the other parameters, see DrawTextAndPositionUrl.
-void DrawTextStartingFrom(gfx::Canvas* canvas,
+void DrawTextStartingFrom(gfx::CanvasSkia* canvas,
                           views::Label* label,
                           const string16& text,
                           gfx::Size* position,