| OLD | NEW |
|---|
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 #include "app/gfx/chrome_font.h" | 5 #include "app/gfx/font.h" |
| 6 | 6 |
| 7 #include <Cocoa/Cocoa.h> | 7 #include <Cocoa/Cocoa.h> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/sys_string_conversions.h" | 10 #include "base/sys_string_conversions.h" |
| 11 | 11 |
| 12 namespace gfx { | 12 namespace gfx { |
| 13 | 13 |
| 14 // static | 14 // static |
| 15 Font Font::CreateFont(const std::wstring& font_name, int font_size) { | 15 Font Font::CreateFont(const std::wstring& font_name, int font_size) { |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 | 81 |
| 82 NativeFont Font::nativeFont() const { | 82 NativeFont Font::nativeFont() const { |
| 83 // TODO(pinkerton): apply |style_| to font. | 83 // TODO(pinkerton): apply |style_| to font. |
| 84 // We could cache this, but then we'd have to conditionally change the | 84 // We could cache this, but then we'd have to conditionally change the |
| 85 // dtor just for MacOS. Not sure if we want to/need to do that. | 85 // dtor just for MacOS. Not sure if we want to/need to do that. |
| 86 return [NSFont fontWithName:base::SysWideToNSString(font_name_) | 86 return [NSFont fontWithName:base::SysWideToNSString(font_name_) |
| 87 size:font_size_]; | 87 size:font_size_]; |
| 88 } | 88 } |
| 89 | 89 |
| 90 } // namespace gfx | 90 } // namespace gfx |
| OLD | NEW |
|---|
Chromium Code Reviews
