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

Side by Side Diff: ui/base/l10n/l10n_font_util.cc

Issue 16402012: Use a direct include of strings headers in ui/, part 1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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 | Annotate | Revision Log
« no previous file with comments | « ui/base/keycodes/keyboard_code_conversion_x.cc ('k') | ui/base/l10n/l10n_util.h » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/base/l10n/l10n_font_util.h" 5 #include "ui/base/l10n/l10n_font_util.h"
6 6
7 #include "base/logging.h"
8 #include "base/strings/string_number_conversions.h"
9 #include "base/strings/utf_string_conversions.h"
7 #include "ui/base/l10n/l10n_util.h" 10 #include "ui/base/l10n/l10n_util.h"
8 #include "base/logging.h"
9 #include "base/string_number_conversions.h"
10 #include "base/strings/utf_string_conversions.h"
11 #include "ui/gfx/font.h" 11 #include "ui/gfx/font.h"
12 12
13 namespace ui { 13 namespace ui {
14 14
15 int GetLocalizedContentsWidthForFont(int col_resource_id, 15 int GetLocalizedContentsWidthForFont(int col_resource_id,
16 const gfx::Font& font) { 16 const gfx::Font& font) {
17 double chars = 0; 17 double chars = 0;
18 base::StringToDouble(l10n_util::GetStringUTF8(col_resource_id), &chars); 18 base::StringToDouble(l10n_util::GetStringUTF8(col_resource_id), &chars);
19 int width = font.GetExpectedTextWidth(static_cast<int>(chars)); 19 int width = font.GetExpectedTextWidth(static_cast<int>(chars));
20 DCHECK_GT(width, 0); 20 DCHECK_GT(width, 0);
(...skipping 10 matching lines...) Expand all
31 } 31 }
32 32
33 gfx::Size GetLocalizedContentsSizeForFont(int col_resource_id, 33 gfx::Size GetLocalizedContentsSizeForFont(int col_resource_id,
34 int row_resource_id, 34 int row_resource_id,
35 const gfx::Font& font) { 35 const gfx::Font& font) {
36 return gfx::Size(GetLocalizedContentsWidthForFont(col_resource_id, font), 36 return gfx::Size(GetLocalizedContentsWidthForFont(col_resource_id, font),
37 GetLocalizedContentsHeightForFont(row_resource_id, font)); 37 GetLocalizedContentsHeightForFont(row_resource_id, font));
38 } 38 }
39 39
40 } // namespace ui 40 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/keycodes/keyboard_code_conversion_x.cc ('k') | ui/base/l10n/l10n_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698