summaryrefslogtreecommitdiffstats
path: root/ui/gfx/platform_font_win.h
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-09 03:32:36 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-09 03:32:36 +0000
commit031ffedfe4071b177730c84361b930aed072c09c (patch)
tree3065c8052ea5023a91e29a272f0c3afd1c205911 /ui/gfx/platform_font_win.h
parent238083df6afe5e7426ab7ff2553d53f9a4dae562 (diff)
downloadchromium_src-031ffedfe4071b177730c84361b930aed072c09c.zip
chromium_src-031ffedfe4071b177730c84361b930aed072c09c.tar.gz
chromium_src-031ffedfe4071b177730c84361b930aed072c09c.tar.bz2
ui/gfx: Use base::string16 now that string16 was moved into base namespace.
base/string16.h was moved into base namespace in r191198 by Brett. BUG=None TBR=ben@chromium.org NOTRY=true Review URL: https://chromiumcodereview.appspot.com/16051006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205096 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/platform_font_win.h')
-rw-r--r--ui/gfx/platform_font_win.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/gfx/platform_font_win.h b/ui/gfx/platform_font_win.h
index be8d77b..568bf95 100644
--- a/ui/gfx/platform_font_win.h
+++ b/ui/gfx/platform_font_win.h
@@ -58,7 +58,7 @@ class UI_EXPORT PlatformFontWin : public PlatformFont {
virtual int GetHeight() const OVERRIDE;
virtual int GetBaseline() const OVERRIDE;
virtual int GetAverageCharacterWidth() const OVERRIDE;
- virtual int GetStringWidth(const string16& text) const OVERRIDE;
+ virtual int GetStringWidth(const base::string16& text) const OVERRIDE;
virtual int GetExpectedTextWidth(int length) const OVERRIDE;
virtual int GetStyle() const OVERRIDE;
virtual std::string GetFontName() const OVERRIDE;