Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(794)

Unified Diff: ui/gfx/text_utils.h

Issue 16051006: ui/gfx: Use base::string16 now that string16 was moved into base namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/render_text_unittest.cc ('k') | ui/gfx/text_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/text_utils.h
diff --git a/ui/gfx/text_utils.h b/ui/gfx/text_utils.h
index 274664f4e23d4bdda80f0847a5e6bbc9d849defd..12035ea1ebece59adce0b791f7bac59fe459934d 100644
--- a/ui/gfx/text_utils.h
+++ b/ui/gfx/text_utils.h
@@ -15,10 +15,10 @@ namespace gfx {
// |accelerated_char_pos| and |accelerated_char_span| will be set to the index
// and span of the last accelerated character, respectively, or -1 and 0 if
// there was none.
-UI_EXPORT string16 RemoveAcceleratorChar(const string16& s,
- char16 accelerator_char,
- int* accelerated_char_pos,
- int* accelerated_char_span);
+UI_EXPORT base::string16 RemoveAcceleratorChar(const base::string16& s,
+ base::char16 accelerator_char,
+ int* accelerated_char_pos,
+ int* accelerated_char_span);
} // namespace gfx
« no previous file with comments | « ui/gfx/render_text_unittest.cc ('k') | ui/gfx/text_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698