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

Unified Diff: ui/gfx/platform_font.h

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: Fix mac unit tests 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:
View side-by-side diff with in-line comments
Download patch
Index: ui/gfx/platform_font.h
diff --git a/ui/gfx/platform_font.h b/ui/gfx/platform_font.h
index 7e316fe78299b8d064fd9283b5ae033e8adee2d5..98b8f689f170319664c85afc87ce78ea468926d3 100644
--- a/ui/gfx/platform_font.h
+++ b/ui/gfx/platform_font.h
@@ -25,7 +25,7 @@ class UI_EXPORT PlatformFont : public base::RefCounted<PlatformFont> {
static PlatformFont* CreateFromNativeFont(NativeFont native_font);
// Creates a PlatformFont implementation with the specified |font_name| and
// |font_size| in pixels.
- static PlatformFont* CreateFromNameAndSize(const string16& font_name,
+ static PlatformFont* CreateFromNameAndSize(const std::string& font_name,
int font_size);
// Returns a new Font derived from the existing font.
@@ -60,7 +60,7 @@ class UI_EXPORT PlatformFont : public base::RefCounted<PlatformFont> {
virtual int GetStyle() const = 0;
// Returns the font name.
- virtual string16 GetFontName() const = 0;
+ virtual std::string GetFontName() const = 0;
// Returns the font size in pixels.
virtual int GetFontSize() const = 0;
« ui/gfx/font.h ('K') | « ui/gfx/font_unittest.cc ('k') | ui/gfx/platform_font_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698