From 476dafb386743bb8db7c3cda201b86b9c70bf753 Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Tue, 3 Dec 2013 00:39:26 +0000 Subject: Move more uses of string16 to specify base:: This makes base, ui, and net compile without the "using base::string16" directive that's currently checked in. BUG= Review URL: https://codereview.chromium.org/100303003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238246 0039d316-1c4b-4281-b951-d872f2087c98 --- ui/gfx/render_text.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ui/gfx/render_text.cc') diff --git a/ui/gfx/render_text.cc b/ui/gfx/render_text.cc index 8061e34..e8e3436 100644 --- a/ui/gfx/render_text.cc +++ b/ui/gfx/render_text.cc @@ -28,7 +28,7 @@ namespace { // All chars are replaced by this char when the password style is set. // TODO(benrg): GTK uses the first of U+25CF, U+2022, U+2731, U+273A, '*' // that's available in the font (find_invisible_char() in gtkentry.c). -const char16 kPasswordReplacementChar = '*'; +const base::char16 kPasswordReplacementChar = '*'; // Default color used for the text and cursor. const SkColor kDefaultColor = SK_ColorBLACK; @@ -879,7 +879,7 @@ const BreakList& RenderText::GetLineBreaks() { if (line_breaks_.max() != 0) return line_breaks_; - const string16& layout_text = GetLayoutText(); + const base::string16& layout_text = GetLayoutText(); const size_t text_length = layout_text.length(); line_breaks_.SetValue(0); line_breaks_.SetMax(text_length); -- cgit v1.1