diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-12 14:37:16 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-12 14:37:16 +0000 |
| commit | 3f891cf79f72f4768a15bfae051e08b9211ed8c3 (patch) | |
| tree | 3cf8d59e7186889184f575fcbe3284e6400fb505 /gfx/platform_font_win.h | |
| parent | e0c7405b8f24e6c0096285446f94f729e63107df (diff) | |
| download | chromium_src-3f891cf79f72f4768a15bfae051e08b9211ed8c3.zip chromium_src-3f891cf79f72f4768a15bfae051e08b9211ed8c3.tar.gz chromium_src-3f891cf79f72f4768a15bfae051e08b9211ed8c3.tar.bz2 | |
Remove wstring from gfx.
BUG=68882
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/6121004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71167 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gfx/platform_font_win.h')
| -rw-r--r-- | gfx/platform_font_win.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gfx/platform_font_win.h b/gfx/platform_font_win.h index 0c310db..4adaa38 100644 --- a/gfx/platform_font_win.h +++ b/gfx/platform_font_win.h @@ -16,7 +16,7 @@ class PlatformFontWin : public PlatformFont { 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 @@ class PlatformFontWin : public PlatformFont { 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 @@ class PlatformFontWin : public PlatformFont { 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 @@ class PlatformFontWin : public PlatformFont { 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 @@ class PlatformFontWin : public PlatformFont { 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 |