chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc - Issue 6134010: Revert 71167 - Remove wstring from gfx....

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc

Issue 6134010: Revert 71167 - Remove wstring from gfx.... (Closed) Base URL: svn://svn.chromium.org/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:

Index: chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc

===================================================================

--- chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc (revision 71168)

+++ chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc (working copy)

@@ -133,7 +133,7 @@

void CloudPrintSetupFlow::GetDialogSize(gfx::Size* size) const {

PrefService* prefs = profile_->GetPrefs();

gfx::Font approximate_web_font(

- UTF8ToUTF16(prefs->GetString(prefs::kWebKitSansSerifFontFamily)),

+ UTF8ToWide(prefs->GetString(prefs::kWebKitSansSerifFontFamily)),

prefs->GetInteger(prefs::kWebKitDefaultFontSize));

if (setup_done_) {

@@ -282,7 +282,7 @@

if (dom_ui_) {

PrefService* prefs = profile_->GetPrefs();

gfx::Font approximate_web_font(

- UTF8ToUTF16(prefs->GetString(prefs::kWebKitSansSerifFontFamily)),

+ UTF8ToWide(prefs->GetString(prefs::kWebKitSansSerifFontFamily)),

prefs->GetInteger(prefs::kWebKitDefaultFontSize));

gfx::Size done_size = gfx::GetLocalizedContentsSizeForFont(

IDS_CLOUD_PRINT_SETUP_WIZARD_DONE_WIDTH_CHARS,

« no previous file with comments | « chrome/browser/gtk/tabs/tab_renderer_gtk.cc ('k') | chrome/browser/remoting/setup_flow.cc » ('j') | no next file with comments »