| OLD | NEW |
|---|
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "gfx/font.h" | 5 #include "ui/gfx/font.h" |
| 6 | 6 |
| 7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
| 8 #include "gfx/platform_font.h" | 8 #include "ui/gfx/platform_font.h" |
| 9 | 9 |
| 10 namespace gfx { | 10 namespace gfx { |
| 11 | 11 |
| 12 //////////////////////////////////////////////////////////////////////////////// | 12 //////////////////////////////////////////////////////////////////////////////// |
| 13 // Font, public: | 13 // Font, public: |
| 14 | 14 |
| 15 Font::Font() : platform_font_(PlatformFont::CreateDefault()) { | 15 Font::Font() : platform_font_(PlatformFont::CreateDefault()) { |
| 16 } | 16 } |
| 17 | 17 |
| 18 Font::Font(const Font& other) : platform_font_(other.platform_font_) { | 18 Font::Font(const Font& other) : platform_font_(other.platform_font_) { |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 | 76 |
| 77 int Font::GetFontSize() const { | 77 int Font::GetFontSize() const { |
| 78 return platform_font_->GetFontSize(); | 78 return platform_font_->GetFontSize(); |
| 79 } | 79 } |
| 80 | 80 |
| 81 NativeFont Font::GetNativeFont() const { | 81 NativeFont Font::GetNativeFont() const { |
| 82 return platform_font_->GetNativeFont(); | 82 return platform_font_->GetNativeFont(); |
| 83 } | 83 } |
| 84 | 84 |
| 85 } // namespace gfx | 85 } // namespace gfx |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 6312156:
Change includes of gfx/* to ui/gfx/* (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src/