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

Side by Side Diff: ui/gfx/font.cc

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/font.h ('k') | ui/gfx/font_fallback_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 #include "ui/gfx/font.h" 5 #include "ui/gfx/font.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "ui/gfx/platform_font.h" 8 #include "ui/gfx/platform_font.h"
9 9
10 namespace gfx { 10 namespace gfx {
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 } 51 }
52 52
53 int Font::GetBaseline() const { 53 int Font::GetBaseline() const {
54 return platform_font_->GetBaseline(); 54 return platform_font_->GetBaseline();
55 } 55 }
56 56
57 int Font::GetAverageCharacterWidth() const { 57 int Font::GetAverageCharacterWidth() const {
58 return platform_font_->GetAverageCharacterWidth(); 58 return platform_font_->GetAverageCharacterWidth();
59 } 59 }
60 60
61 int Font::GetStringWidth(const string16& text) const { 61 int Font::GetStringWidth(const base::string16& text) const {
62 return platform_font_->GetStringWidth(text); 62 return platform_font_->GetStringWidth(text);
63 } 63 }
64 64
65 int Font::GetExpectedTextWidth(int length) const { 65 int Font::GetExpectedTextWidth(int length) const {
66 return platform_font_->GetExpectedTextWidth(length); 66 return platform_font_->GetExpectedTextWidth(length);
67 } 67 }
68 68
69 int Font::GetStyle() const { 69 int Font::GetStyle() const {
70 return platform_font_->GetStyle(); 70 return platform_font_->GetStyle();
71 } 71 }
72 72
73 std::string Font::GetFontName() const { 73 std::string Font::GetFontName() const {
74 return platform_font_->GetFontName(); 74 return platform_font_->GetFontName();
75 } 75 }
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
OLDNEW
« no previous file with comments | « ui/gfx/font.h ('k') | ui/gfx/font_fallback_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698