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

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

Issue 10081007: Remove unused and unnecessary constructor from PlatformFont classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « ui/gfx/platform_font_android.cc ('k') | ui/gfx/platform_font_mac.mm » ('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_MAC_H_ 5 #ifndef UI_GFX_PLATFORM_FONT_MAC_H_
6 #define UI_GFX_PLATFORM_FONT_MAC_H_ 6 #define UI_GFX_PLATFORM_FONT_MAC_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "ui/gfx/platform_font.h" 10 #include "ui/gfx/platform_font.h"
11 11
12 namespace gfx { 12 namespace gfx {
13 13
14 class PlatformFontMac : public PlatformFont { 14 class PlatformFontMac : public PlatformFont {
15 public: 15 public:
16 PlatformFontMac(); 16 PlatformFontMac();
17 explicit PlatformFontMac(const Font& other);
18 explicit PlatformFontMac(NativeFont native_font); 17 explicit PlatformFontMac(NativeFont native_font);
19 PlatformFontMac(const std::string& font_name, 18 PlatformFontMac(const std::string& font_name,
20 int font_size); 19 int font_size);
21 20
22 // Overridden from PlatformFont: 21 // Overridden from PlatformFont:
23 virtual Font DeriveFont(int size_delta, int style) const OVERRIDE; 22 virtual Font DeriveFont(int size_delta, int style) const OVERRIDE;
24 virtual int GetHeight() const OVERRIDE; 23 virtual int GetHeight() const OVERRIDE;
25 virtual int GetBaseline() const OVERRIDE; 24 virtual int GetBaseline() const OVERRIDE;
26 virtual int GetAverageCharacterWidth() const OVERRIDE; 25 virtual int GetAverageCharacterWidth() const OVERRIDE;
27 virtual int GetStringWidth(const string16& text) const OVERRIDE; 26 virtual int GetStringWidth(const string16& text) const OVERRIDE;
(...skipping 21 matching lines...) Expand all
49 48
50 // Cached metrics, generated at construction 49 // Cached metrics, generated at construction
51 int height_; 50 int height_;
52 int ascent_; 51 int ascent_;
53 int average_width_; 52 int average_width_;
54 }; 53 };
55 54
56 } // namespace gfx 55 } // namespace gfx
57 56
58 #endif // UI_GFX_PLATFORM_FONT_MAC_H_ 57 #endif // UI_GFX_PLATFORM_FONT_MAC_H_
OLDNEW
« no previous file with comments | « ui/gfx/platform_font_android.cc ('k') | ui/gfx/platform_font_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698