Move |PlatformFont::GetStringWidth()| implementation up into font.cc directly.

ui/gfx/canvas_skia.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_SKIA_H_
 #define UI_GFX_CANVAS_SKIA_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 52 matching lines @@
 
   // Compute the size required to draw some text with the provided font.
   // Attempts to fit the text with the provided width and height. Increases
   // height and then width as needed to make the text fit. This method
   // supports multiple lines.
   static void SizeStringInt(const string16& text,
                             const gfx::Font& font,
                             int* width, int* height,
                             int flags);
 
+  // Returns the number of horizontal pixels needed to display the specified
+  // |text| with |font|.
+  static int GetStringWidth(const string16& text, const gfx::Font& font);
+
   // Returns the default text alignment to be used when drawing text on a
   // gfx::CanvasSkia based on the directionality of the system locale language.
   // This function is used by gfx::Canvas::DrawStringInt when the text alignment
   // is not specified.
   //
   // This function returns either gfx::Canvas::TEXT_ALIGN_LEFT or
   // gfx::Canvas::TEXT_ALIGN_RIGHT.
   static int DefaultCanvasTextAlignment();
 
 #if defined(TOOLKIT_USES_GTK)
@@ skipping 116 matching lines @@
 
   scoped_ptr<skia::PlatformCanvas> owned_canvas_;
   SkCanvas* canvas_;
 
   DISALLOW_COPY_AND_ASSIGN(CanvasSkia);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_CANVAS_SKIA_H_