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

Unified Diff: gfx/platform_font_mac.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/platform_font_gtk.cc ('k') | gfx/platform_font_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gfx/platform_font_mac.h
===================================================================
--- gfx/platform_font_mac.h (revision 71168)
+++ gfx/platform_font_mac.h (working copy)
@@ -15,7 +15,7 @@
PlatformFontMac();
explicit PlatformFontMac(const Font& other);
explicit PlatformFontMac(NativeFont native_font);
- PlatformFontMac(const string16& font_name,
+ PlatformFontMac(const std::wstring& font_name,
int font_size);
// Overridden from PlatformFont:
@@ -26,23 +26,23 @@
virtual int GetStringWidth(const string16& text) const;
virtual int GetExpectedTextWidth(int length) const;
virtual int GetStyle() const;
- virtual string16 GetFontName() const;
+ virtual const std::wstring& GetFontName() const;
virtual int GetFontSize() const;
virtual NativeFont GetNativeFont() const;
private:
- PlatformFontMac(const string16& font_name, int font_size, int style);
+ PlatformFontMac(const std::wstring& font_name, int font_size, int style);
virtual ~PlatformFontMac() {}
// Initialize the object with the specified parameters.
- void InitWithNameSizeAndStyle(const string16& font_name,
+ void InitWithNameSizeAndStyle(const std::wstring& font_name,
int font_size,
int style);
// Calculate and cache the font metrics.
void CalculateMetrics();
- string16 font_name_;
+ std::wstring font_name_;
int font_size_;
int style_;
« no previous file with comments | « gfx/platform_font_gtk.cc ('k') | gfx/platform_font_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698