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

Unified Diff: gfx/platform_font_win.h

Issue 6121004: Remove wstring from gfx. (Closed) Base URL: svn://chrome-svn/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_mac.mm ('k') | gfx/platform_font_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gfx/platform_font_win.h
===================================================================
--- gfx/platform_font_win.h (revision 71043)
+++ gfx/platform_font_win.h (working copy)
@@ -16,7 +16,7 @@
PlatformFontWin();
explicit PlatformFontWin(const Font& other);
explicit PlatformFontWin(NativeFont native_font);
- PlatformFontWin(const std::wstring& font_name,
+ PlatformFontWin(const string16& font_name,
int font_size);
// Dialog units to pixels conversion.
@@ -48,7 +48,7 @@
virtual int GetStringWidth(const string16& text) const;
virtual int GetExpectedTextWidth(int length) const;
virtual int GetStyle() const;
- virtual const std::wstring& GetFontName() const;
+ virtual string16 GetFontName() const;
virtual int GetFontSize() const;
virtual NativeFont GetNativeFont() const;
@@ -81,7 +81,7 @@
int ave_char_width() const { return ave_char_width_; }
int style() const { return style_; }
int dlu_base_x() const { return dlu_base_x_; }
- const std::wstring& font_name() const { return font_name_; }
+ const string16& font_name() const { return font_name_; }
private:
friend class base::RefCounted<HFontRef>;
@@ -95,7 +95,7 @@
const int style_;
// Constants used in converting dialog units to pixels.
const int dlu_base_x_;
- std::wstring font_name_;
+ string16 font_name_;
DISALLOW_COPY_AND_ASSIGN(HFontRef);
};
@@ -104,7 +104,7 @@
void InitWithCopyOfHFONT(HFONT hfont);
// Initializes this object with the specified font name and size.
- void InitWithFontNameAndSize(const std::wstring& font_name,
+ void InitWithFontNameAndSize(const string16& font_name,
int font_size);
// Returns the base font ref. This should ONLY be invoked on the
« no previous file with comments | « gfx/platform_font_mac.mm ('k') | gfx/platform_font_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698