Supports gfx::FontList in gfx::Canvas and ui::ElideText family.

ui/gfx/canvas_android.cc

Index: ui/gfx/canvas_android.cc
diff --git a/ui/gfx/canvas_android.cc b/ui/gfx/canvas_android.cc
index c26a668f1d466ba805125e9dd06f77faa9f70f16..2a74c2e1d29df3230ac184dc53fc2208fd8cc93f 100644
--- a/ui/gfx/canvas_android.cc
+++ b/ui/gfx/canvas_android.cc
@@ -5,7 +5,6 @@
 #include "ui/gfx/canvas.h"
 
 #include "base/logging.h"
-#include "ui/gfx/font.h"
 
 namespace gfx {
 
@@ -19,13 +18,35 @@ void Canvas::SizeStringInt(const base::string16& text,
   NOTIMPLEMENTED();
 }
 
-void Canvas::DrawStringWithShadows(const base::string16& text,
-                                   const gfx::Font& font,
-                                   SkColor color,
-                                   const gfx::Rect& text_bounds,
-                                   int line_height,
-                                   int flags,
-                                   const ShadowValues& shadows) {
+// static
+int Canvas::GetStringWidth(const base::string16& text,
+                           const gfx::FontList& font_list) {
+  NOTIMPLEMENTED();
+  return 0;
+}
+
+// static
+int Canvas::GetStringWidth(const base::string16& text, const gfx::Font& font) {
+  NOTIMPLEMENTED();
+  return 0;
+}
+
+void Canvas::DrawStringWithHaloRect(const base::string16& text,
+                                    const FontList& font_list,
+                                    SkColor text_color,
+                                    SkColor halo_color_in,
+                                    const Rect& display_rect,
+                                    int flags) {
+  NOTIMPLEMENTED();
+}
+
+void Canvas::DrawStringWithShadowsRect(const base::string16& text,
+                                       const gfx::FontList& font_list,
+                                       SkColor color,
+                                       const gfx::Rect& text_bounds,
+                                       int line_height,
+                                       int flags,
+                                       const ShadowValues& shadows) {
   NOTIMPLEMENTED();
 }