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

Unified Diff: ui/gfx/pango_util.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/pango_util.h ('k') | ui/gfx/platform_font.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/pango_util.cc
diff --git a/ui/gfx/pango_util.cc b/ui/gfx/pango_util.cc
index 3d5756316f3d94a8f4418914191d2b85bbb0f914..3f96d4b140d6f5e76129da7d862dc02a77f6f9de 100644
--- a/ui/gfx/pango_util.cc
+++ b/ui/gfx/pango_util.cc
@@ -144,7 +144,7 @@ double GetPangoResolution() {
}
void DrawTextOntoCairoSurface(cairo_t* cr,
- const string16& text,
+ const base::string16& text,
const gfx::Font& font,
const gfx::Rect& bounds,
const gfx::Rect& clip,
@@ -180,7 +180,7 @@ void DrawTextOntoCairoSurface(cairo_t* cr,
// Pass a width greater than 0 to force wrapping and eliding.
static void SetupPangoLayoutWithoutFont(
PangoLayout* layout,
- const string16& text,
+ const base::string16& text,
int width,
base::i18n::TextDirection text_direction,
int flags) {
@@ -266,7 +266,7 @@ static void SetupPangoLayoutWithoutFont(
// a single ampersand.
if (flags & Canvas::HIDE_PREFIX) {
DCHECK_EQ(1, g_unichar_to_utf8(kAcceleratorChar, NULL));
- string16 accelerator_removed =
+ base::string16 accelerator_removed =
RemoveAcceleratorChar(text, static_cast<char16>(kAcceleratorChar),
NULL, NULL);
utf8 = UTF16ToUTF8(accelerator_removed);
@@ -279,7 +279,7 @@ static void SetupPangoLayoutWithoutFont(
}
void SetupPangoLayout(PangoLayout* layout,
- const string16& text,
+ const base::string16& text,
const Font& font,
int width,
base::i18n::TextDirection text_direction,
@@ -292,7 +292,7 @@ void SetupPangoLayout(PangoLayout* layout,
void SetupPangoLayoutWithFontDescription(
PangoLayout* layout,
- const string16& text,
+ const base::string16& text,
const std::string& font_description,
int width,
base::i18n::TextDirection text_direction,
« no previous file with comments | « ui/gfx/pango_util.h ('k') | ui/gfx/platform_font.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698