Index: ui/gfx/text_utils.cc |
diff --git a/ui/gfx/text_utils.cc b/ui/gfx/text_utils.cc |
index 8a2658c8bed8f9ed9f3f4442861b67bc901d1786..a31ef3d3cc999cd844fb4042b17628b9db976bcf 100644 |
--- a/ui/gfx/text_utils.cc |
+++ b/ui/gfx/text_utils.cc |
@@ -8,15 +8,15 @@ |
namespace gfx { |
-string16 RemoveAcceleratorChar(const string16& s, |
- char16 accelerator_char, |
- int* accelerated_char_pos, |
- int* accelerated_char_span) { |
+base::string16 RemoveAcceleratorChar(const base::string16& s, |
+ base::char16 accelerator_char, |
+ int* accelerated_char_pos, |
+ int* accelerated_char_span) { |
bool escaped = false; |
ptrdiff_t last_char_pos = -1; |
int last_char_span = 0; |
base::i18n::UTF16CharIterator chars(&s); |
- string16 accelerator_removed; |
+ base::string16 accelerator_removed; |
accelerator_removed.reserve(s.size()); |
while (!chars.end()) { |