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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gfx/platform_font.h

Issue 6134010: Revert 71167 - Remove wstring from gfx.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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 | « gfx/font_unittest.cc ('k') | gfx/platform_font_gtk.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gfx/platform_font.h
===================================================================
--- gfx/platform_font.h (revision 71168)
+++ gfx/platform_font.h (working copy)
@@ -22,7 +22,7 @@
static PlatformFont* CreateDefault();
static PlatformFont* CreateFromFont(const Font& other);
static PlatformFont* CreateFromNativeFont(NativeFont native_font);
- static PlatformFont* CreateFromNameAndSize(const string16& font_name,
+ static PlatformFont* CreateFromNameAndSize(const std::wstring& font_name,
int font_size);
// Returns a new Font derived from the existing font.
@@ -58,7 +58,7 @@
virtual int GetStyle() const = 0;
// Returns the font name.
- virtual string16 GetFontName() const = 0;
+ virtual const std::wstring& GetFontName() const = 0;
// Returns the font size in pixels.
virtual int GetFontSize() const = 0;
« no previous file with comments | « gfx/font_unittest.cc ('k') | gfx/platform_font_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698