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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/login/oobe_progress_bar.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/drop_shadow_label.cc ('k') | chrome/browser/chromeos/login/username_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/oobe_progress_bar.cc
===================================================================
--- chrome/browser/chromeos/login/oobe_progress_bar.cc (revision 71168)
+++ chrome/browser/chromeos/login/oobe_progress_bar.cc (working copy)
@@ -111,7 +111,7 @@
next_x - ix, line_->height());
}
- string16 str = l10n_util::GetStringUTF16(steps_[i]);
+ std::wstring str = UTF16ToWide(l10n_util::GetStringUTF16(steps_[i]));
canvas->DrawStringInt(str, font_, color,
x + kTextPadding, y + dot->height() + kTextPadding,
(next_x - x - 2 * kTextPadding),
« no previous file with comments | « chrome/browser/chromeos/drop_shadow_label.cc ('k') | chrome/browser/chromeos/login/username_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698