ui/gfx/platform_font_mac.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/platform_font_mac.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/platform_font_mac.h

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

index 42bbd9a96d79e0ed3242d417c39a2c8e1d6f810f..13c8677c228ab447ac9b8ed6c5c3335a2e3b82c9 100644

--- a/ui/gfx/platform_font_mac.h

+++ b/ui/gfx/platform_font_mac.h

@@ -22,7 +22,7 @@ class PlatformFontMac : public PlatformFont {

virtual int GetHeight() const OVERRIDE;

virtual int GetBaseline() const OVERRIDE;

virtual int GetAverageCharacterWidth() const OVERRIDE;

- virtual int GetStringWidth(const string16& text) const OVERRIDE;

+ virtual int GetStringWidth(const base::string16& text) const OVERRIDE;

virtual int GetExpectedTextWidth(int length) const OVERRIDE;

virtual int GetStyle() const OVERRIDE;

virtual std::string GetFontName() const OVERRIDE;

« no previous file with comments | « ui/gfx/platform_font_ios.mm ('k') | ui/gfx/platform_font_mac.mm » ('j') | no next file with comments »