chrome/browser/ui/views/location_bar/content_setting_image_view.cc - Issue 6121004: 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/ui/views/location_bar/content_setting_image_view.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:

Index: chrome/browser/ui/views/location_bar/content_setting_image_view.cc

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

--- chrome/browser/ui/views/location_bar/content_setting_image_view.cc (revision 71043)

+++ chrome/browser/ui/views/location_bar/content_setting_image_view.cc (working copy)

@@ -183,7 +183,7 @@

if (animation_in_progress_) {

// Paint text to the right of the icon.

ResourceBundle& rb = ResourceBundle::GetSharedInstance();

- canvas->DrawStringInt(UTF16ToWideHack(animated_text_),

+ canvas->DrawStringInt(animated_text_,

rb.GetFont(ResourceBundle::MediumFont), SK_ColorBLACK,

GetImageBounds().right() + kTextMarginPixels, y(),

width() - GetImageBounds().width(), height(),