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

Unified Diff: ui/gfx/canvas_unittest.cc

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/canvas_skia.cc ('k') | ui/gfx/font.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/canvas_unittest.cc
diff --git a/ui/gfx/canvas_unittest.cc b/ui/gfx/canvas_unittest.cc
index 43ad7f3e71ce913f4756ebceca06ac4dc6abb121..21b9f51e57e8eee4e12e16d4390d83b4c5cbde64 100644
--- a/ui/gfx/canvas_unittest.cc
+++ b/ui/gfx/canvas_unittest.cc
@@ -18,9 +18,10 @@ class CanvasTest : public testing::Test {
}
gfx::Size SizeStringInt(const char *text, int width, int line_height) {
- string16 text16 = UTF8ToUTF16(text);
+ base::string16 text16 = UTF8ToUTF16(text);
int height = 0;
- int flags = (text16.find('\n') != string16::npos) ? Canvas::MULTI_LINE : 0;
+ int flags =
+ (text16.find('\n') != base::string16::npos) ? Canvas::MULTI_LINE : 0;
Canvas::SizeStringInt(text16, font_, &width, &height, line_height, flags);
return gfx::Size(width, height);
}
« no previous file with comments | « ui/gfx/canvas_skia.cc ('k') | ui/gfx/font.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698