diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-12 16:24:45 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-12 16:24:45 +0000 |
| commit | 76fcc3e9dc467366b9d1938834d7faff595ab873 (patch) | |
| tree | dcfc78d6c356be77a902a3fe5e59a6590fe7521e /chrome/browser/printing | |
| parent | 3a742fcae0c094dd1ea11354fb3dcfe9ccc07a73 (diff) | |
| download | chromium_src-76fcc3e9dc467366b9d1938834d7faff595ab873.zip chromium_src-76fcc3e9dc467366b9d1938834d7faff595ab873.tar.gz chromium_src-76fcc3e9dc467366b9d1938834d7faff595ab873.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/printing')
| -rw-r--r-- | chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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, |