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

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

Issue 16757004: Use a direct include of strings headers in ui/, part 3. (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/gfx/font_list_unittest.cc ('k') | ui/gfx/insets.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/string16.h" 7 #include "base/strings/string16.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 10
11 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) 11 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
12 #include <pango/pango.h> 12 #include <pango/pango.h>
13 #elif defined(OS_WIN) 13 #elif defined(OS_WIN)
14 #include "ui/gfx/platform_font_win.h" 14 #include "ui/gfx/platform_font_win.h"
15 #endif 15 #endif
16 16
17 namespace gfx { 17 namespace gfx {
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 // The minimum font size is set to 5 in browser_main.cc. 127 // The minimum font size is set to 5 in browser_main.cc.
128 ScopedMinimumFontSizeCallback minimum_size(5); 128 ScopedMinimumFontSizeCallback minimum_size(5);
129 129
130 Font derived_font = cf.DeriveFont(-2); 130 Font derived_font = cf.DeriveFont(-2);
131 EXPECT_EQ(6, derived_font.GetFontSize()); 131 EXPECT_EQ(6, derived_font.GetFontSize());
132 } 132 }
133 #endif // defined(OS_WIN) 133 #endif // defined(OS_WIN)
134 134
135 } // namespace 135 } // namespace
136 } // namespace gfx 136 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/font_list_unittest.cc ('k') | ui/gfx/insets.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698