diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-03 00:39:26 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-03 00:39:26 +0000 |
| commit | 476dafb386743bb8db7c3cda201b86b9c70bf753 (patch) | |
| tree | 6d43f23f392d4fba47e8690cec1088a27b8fe12b /ui/gfx/render_text.cc | |
| parent | abdd6ba46c3c48c3c307ee0c5e5697d9f4f4fc99 (diff) | |
| download | chromium_src-476dafb386743bb8db7c3cda201b86b9c70bf753.zip chromium_src-476dafb386743bb8db7c3cda201b86b9c70bf753.tar.gz chromium_src-476dafb386743bb8db7c3cda201b86b9c70bf753.tar.bz2 | |
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
Diffstat (limited to 'ui/gfx/render_text.cc')
| -rw-r--r-- | ui/gfx/render_text.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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<size_t>& 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); |