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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: views/controls/label_unittest.cc

Issue 6121004: Remove wstring from gfx. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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 side-by-side diff with in-line comments
Download patch
« gfx/platform_font.h ('K') | « views/controls/label.cc ('k') | views/controls/menu/menu_item_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/label_unittest.cc
===================================================================
--- views/controls/label_unittest.cc (revision 71043)
+++ views/controls/label_unittest.cc (working copy)
@@ -19,7 +19,7 @@
// Courier is failing on linux because it's non scalable.
TEST(LabelTest, FontPropertyCourier) {
Label label;
- std::wstring font_name(L"courier");
+ string16 font_name(ASCIIToUTF16("courier"));
gfx::Font font = gfx::Font::CreateFont(font_name, 30);
label.SetFont(font);
gfx::Font font_used = label.font();
@@ -30,7 +30,7 @@
TEST(LabelTest, FontPropertyArial) {
Label label;
- std::wstring font_name(L"arial");
+ string16 font_name(ASCIIToUTF16("arial"));
gfx::Font font(font_name, 30);
label.SetFont(font);
gfx::Font font_used = label.font();
« gfx/platform_font.h ('K') | « views/controls/label.cc ('k') | views/controls/menu/menu_item_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698