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

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

Issue 1543183002: Switch to standard integer types in ui/gfx/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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.h ('k') | ui/gfx/platform_font_ios.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_IOS_H_ 5 #ifndef UI_GFX_PLATFORM_FONT_IOS_H_
6 #define UI_GFX_PLATFORM_FONT_IOS_H_ 6 #define UI_GFX_PLATFORM_FONT_IOS_H_
7 7
8 #include "base/macros.h"
8 #include "ui/gfx/platform_font.h" 9 #include "ui/gfx/platform_font.h"
9 10
10 namespace gfx { 11 namespace gfx {
11 12
12 class PlatformFontIOS : public PlatformFont { 13 class PlatformFontIOS : public PlatformFont {
13 public: 14 public:
14 PlatformFontIOS(); 15 PlatformFontIOS();
15 explicit PlatformFontIOS(NativeFont native_font); 16 explicit PlatformFontIOS(NativeFont native_font);
16 PlatformFontIOS(const std::string& font_name, 17 PlatformFontIOS(const std::string& font_name,
17 int font_size); 18 int font_size);
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 int ascent_; 51 int ascent_;
51 int cap_height_; 52 int cap_height_;
52 int average_width_; 53 int average_width_;
53 54
54 DISALLOW_COPY_AND_ASSIGN(PlatformFontIOS); 55 DISALLOW_COPY_AND_ASSIGN(PlatformFontIOS);
55 }; 56 };
56 57
57 } // namespace gfx 58 } // namespace gfx
58 59
59 #endif // UI_GFX_PLATFORM_FONT_IOS_H_ 60 #endif // UI_GFX_PLATFORM_FONT_IOS_H_
OLDNEW
« no previous file with comments | « ui/gfx/platform_font.h ('k') | ui/gfx/platform_font_ios.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698