From 76fcc3e9dc467366b9d1938834d7faff595ab873 Mon Sep 17 00:00:00 2001 From: "avi@chromium.org" Date: Wed, 12 Jan 2011 16:24:45 +0000 Subject: Revert 71169 - Revert 71167 - Remove wstring from gfx. BUG=68882 TEST=no visible changes; all tests pass Review URL: http://codereview.chromium.org/6121004 TBR=avi@chromium.org Review URL: http://codereview.chromium.org/6134010 TBR=joi@chromium.org Review URL: http://codereview.chromium.org/6130008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71176 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chrome/browser/printing') diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc index da8d670..d49bbbd 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc @@ -133,7 +133,7 @@ void CloudPrintSetupFlow::GetDOMMessageHandlers( void CloudPrintSetupFlow::GetDialogSize(gfx::Size* size) const { PrefService* prefs = profile_->GetPrefs(); gfx::Font approximate_web_font( - UTF8ToWide(prefs->GetString(prefs::kWebKitSansSerifFontFamily)), + UTF8ToUTF16(prefs->GetString(prefs::kWebKitSansSerifFontFamily)), prefs->GetInteger(prefs::kWebKitDefaultFontSize)); if (setup_done_) { @@ -282,7 +282,7 @@ void CloudPrintSetupFlow::ShowSetupDone() { if (dom_ui_) { PrefService* prefs = profile_->GetPrefs(); gfx::Font approximate_web_font( - UTF8ToWide(prefs->GetString(prefs::kWebKitSansSerifFontFamily)), + UTF8ToUTF16(prefs->GetString(prefs::kWebKitSansSerifFontFamily)), prefs->GetInteger(prefs::kWebKitDefaultFontSize)); gfx::Size done_size = gfx::GetLocalizedContentsSizeForFont( IDS_CLOUD_PRINT_SETUP_WIZARD_DONE_WIDTH_CHARS, -- cgit v1.1