ui/gfx/font.cc - Issue 8392017: Change string16 to std::string in the gfx::Font() interface.

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/font.cc

Issue 8392017: Change string16 to std::string in the gfx::Font() interface. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Add 'UTF-8' everywhere in the comments Created 9 years, 2 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:

Index: ui/gfx/font.cc

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

index 08b7b34e36c9a533950cb71723a909cb5f7700ec..1a3593fa76c6fff25b27c7eab7c334dce04c67ec 100644

--- a/ui/gfx/font.cc

+++ b/ui/gfx/font.cc

@@ -30,7 +30,7 @@ Font::Font(NativeFont native_font)

Font::Font(PlatformFont* platform_font) : platform_font_(platform_font) {

}

-Font::Font(const string16& font_name, int font_size)

+Font::Font(const std::string& font_name, int font_size)

: platform_font_(PlatformFont::CreateFromNameAndSize(font_name,

font_size)) {

}

@@ -70,7 +70,7 @@ int Font::GetStyle() const {

return platform_font_->GetStyle();

}

-string16 Font::GetFontName() const {

+std::string Font::GetFontName() const {

return platform_font_->GetFontName();

}

« no previous file with comments | « ui/gfx/font.h ('k') | ui/gfx/font_unittest.cc » ('j') | no next file with comments »