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

Unified Diff: chrome/browser/chromeos/login/update_view.cc

Issue 6156001: Remove wstring from l10n_util. Part 8, the last part.... (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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/login/screen_locker.cc ('k') | chrome/browser/chromeos/login/user_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/update_view.cc
===================================================================
--- chrome/browser/chromeos/login/update_view.cc (revision 70736)
+++ chrome/browser/chromeos/login/update_view.cc (working copy)
@@ -8,6 +8,7 @@
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/chromeos/login/helper.h"
#include "chrome/browser/chromeos/login/rounded_rect_painter.h"
#include "chrome/browser/chromeos/login/update_screen.h"
@@ -105,12 +106,15 @@
}
void UpdateView::UpdateLocalizedStrings() {
- installing_updates_label_->SetText(
- l10n_util::GetStringF(IDS_INSTALLING_UPDATE,
- l10n_util::GetString(IDS_PRODUCT_OS_NAME)));
- reboot_label_->SetText(l10n_util::GetString(IDS_INSTALLING_UPDATE_DESC));
- manual_reboot_label_->SetText(l10n_util::GetString(IDS_UPDATE_COMPLETED));
- checking_label_->SetText(l10n_util::GetString(IDS_CHECKING_FOR_UPDATES));
+ installing_updates_label_->SetText(UTF16ToWide(l10n_util::GetStringFUTF16(
+ IDS_INSTALLING_UPDATE,
+ l10n_util::GetStringUTF16(IDS_PRODUCT_OS_NAME))));
+ reboot_label_->SetText(
+ UTF16ToWide(l10n_util::GetStringUTF16(IDS_INSTALLING_UPDATE_DESC)));
+ manual_reboot_label_->SetText(
+ UTF16ToWide(l10n_util::GetStringUTF16(IDS_UPDATE_COMPLETED)));
+ checking_label_->SetText(
+ UTF16ToWide(l10n_util::GetStringUTF16(IDS_CHECKING_FOR_UPDATES)));
}
void UpdateView::AddProgress(int ticks) {
« no previous file with comments | « chrome/browser/chromeos/login/screen_locker.cc ('k') | chrome/browser/chromeos/login/user_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698