ui/gfx/pango_util.h - Issue 16051006: ui/gfx: Use base::string16 now that string16 was moved into base namespace.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/gfx/pango_util.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

Index: ui/gfx/pango_util.h

diff --git a/ui/gfx/pango_util.h b/ui/gfx/pango_util.h

index a6721354ecfc58bd16d05e52a91bcad94e3dea6c..48b0c530ab271c3c5bb680920d752388703be252 100644

--- a/ui/gfx/pango_util.h

+++ b/ui/gfx/pango_util.h

@@ -52,7 +52,7 @@ class ScopedPangoFontDescription {

// Uses Pango to draw text onto |cr|. This is the public method for d

void UI_EXPORT DrawTextOntoCairoSurface(cairo_t* cr,

- const string16& text,

+ const base::string16& text,

const gfx::Font& font,

const gfx::Rect& bounds,

const gfx::Rect& clip,

@@ -68,7 +68,7 @@ void UI_EXPORT DrawTextOntoCairoSurface(cairo_t* cr,

// the |width| in PANGO_SCALE for RTL locale, the base |text_direction|,

// alignment, ellipsis, word wrapping, resolution, etc.

void SetupPangoLayout(PangoLayout* layout,

- const string16& text,

+ const base::string16& text,

const gfx::Font& font,

int width,

base::i18n::TextDirection text_direction,

@@ -78,7 +78,7 @@ void SetupPangoLayout(PangoLayout* layout,

// sets the font description based on |font_description|.

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/font_unittest.cc ('k') | ui/gfx/pango_util.cc » ('j') | no next file with comments »