ui/gfx/canvas_android.cc - 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/canvas_android.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

Index: ui/gfx/canvas_android.cc

diff --git a/ui/gfx/canvas_android.cc b/ui/gfx/canvas_android.cc

index 0c339f9dc0320bb200743a9eb4e5315e70095d24..c26a668f1d466ba805125e9dd06f77faa9f70f16 100644

--- a/ui/gfx/canvas_android.cc

+++ b/ui/gfx/canvas_android.cc

@@ -10,7 +10,7 @@

namespace gfx {

// static

-void Canvas::SizeStringInt(const string16& text,

+void Canvas::SizeStringInt(const base::string16& text,

const gfx::Font& font,

int* width,

int* height,

@@ -19,7 +19,7 @@ void Canvas::SizeStringInt(const string16& text,

NOTIMPLEMENTED();

}

-void Canvas::DrawStringWithShadows(const string16& text,

+void Canvas::DrawStringWithShadows(const base::string16& text,

const gfx::Font& font,

SkColor color,

const gfx::Rect& text_bounds,

« no previous file with comments | « ui/gfx/canvas.cc ('k') | ui/gfx/canvas_mac.mm » ('j') | no next file with comments »