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

Side by Side Diff: ui/gfx/platform_font_win.h

Issue 16051006: ui/gfx: Use base::string16 now that string16 was moved into base namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 6 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 unified diff | Download patch
« no previous file with comments | « ui/gfx/platform_font_pango.cc ('k') | ui/gfx/platform_font_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_GFX_PLATFORM_FONT_WIN_H_ 5 #ifndef UI_GFX_PLATFORM_FONT_WIN_H_
6 #define UI_GFX_PLATFORM_FONT_WIN_H_ 6 #define UI_GFX_PLATFORM_FONT_WIN_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 // returned. Otherwise, the returned Font will have the largest size such that 51 // returned. Otherwise, the returned Font will have the largest size such that
52 // its height is less than or equal to |height| (since there may not exist a 52 // its height is less than or equal to |height| (since there may not exist a
53 // size that matches the exact |height| specified). 53 // size that matches the exact |height| specified).
54 Font DeriveFontWithHeight(int height, int style); 54 Font DeriveFontWithHeight(int height, int style);
55 55
56 // Overridden from PlatformFont: 56 // Overridden from PlatformFont:
57 virtual Font DeriveFont(int size_delta, int style) const OVERRIDE; 57 virtual Font DeriveFont(int size_delta, int style) const OVERRIDE;
58 virtual int GetHeight() const OVERRIDE; 58 virtual int GetHeight() const OVERRIDE;
59 virtual int GetBaseline() const OVERRIDE; 59 virtual int GetBaseline() const OVERRIDE;
60 virtual int GetAverageCharacterWidth() const OVERRIDE; 60 virtual int GetAverageCharacterWidth() const OVERRIDE;
61 virtual int GetStringWidth(const string16& text) const OVERRIDE; 61 virtual int GetStringWidth(const base::string16& text) const OVERRIDE;
62 virtual int GetExpectedTextWidth(int length) const OVERRIDE; 62 virtual int GetExpectedTextWidth(int length) const OVERRIDE;
63 virtual int GetStyle() const OVERRIDE; 63 virtual int GetStyle() const OVERRIDE;
64 virtual std::string GetFontName() const OVERRIDE; 64 virtual std::string GetFontName() const OVERRIDE;
65 virtual int GetFontSize() const OVERRIDE; 65 virtual int GetFontSize() const OVERRIDE;
66 virtual NativeFont GetNativeFont() const OVERRIDE; 66 virtual NativeFont GetNativeFont() const OVERRIDE;
67 67
68 private: 68 private:
69 virtual ~PlatformFontWin() {} 69 virtual ~PlatformFontWin() {}
70 70
71 // Chrome text drawing bottoms out in the Windows GDI functions that take an 71 // Chrome text drawing bottoms out in the Windows GDI functions that take an
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 // Indirect reference to the HFontRef, which references the underlying HFONT. 149 // Indirect reference to the HFontRef, which references the underlying HFONT.
150 scoped_refptr<HFontRef> font_ref_; 150 scoped_refptr<HFontRef> font_ref_;
151 151
152 DISALLOW_COPY_AND_ASSIGN(PlatformFontWin); 152 DISALLOW_COPY_AND_ASSIGN(PlatformFontWin);
153 }; 153 };
154 154
155 } // namespace gfx 155 } // namespace gfx
156 156
157 #endif // UI_GFX_PLATFORM_FONT_WIN_H_ 157 #endif // UI_GFX_PLATFORM_FONT_WIN_H_
158 158
OLDNEW
« no previous file with comments | « ui/gfx/platform_font_pango.cc ('k') | ui/gfx/platform_font_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698