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

Unified Diff: chrome/browser/ui/views/confirm_message_box_dialog.cc

Issue 6088008: Remove wstring from l10n_util. Part 7.... (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
Index: chrome/browser/ui/views/confirm_message_box_dialog.cc
===================================================================
--- chrome/browser/ui/views/confirm_message_box_dialog.cc (revision 70562)
+++ chrome/browser/ui/views/confirm_message_box_dialog.cc (working copy)
@@ -6,6 +6,7 @@
#include "app/l10n_util.h"
#include "app/message_box_flags.h"
+#include "base/utf_string_conversions.h"
#include "grit/generated_resources.h"
#include "grit/locale_settings.h"
#include "views/standard_layout.h"
@@ -53,10 +54,10 @@
preferred_size_(gfx::Size(views::Window::GetLocalizedContentsSize(
IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS,
IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES))),
- confirm_label_(l10n_util::GetString(
- IDS_CONFIRM_MESSAGEBOX_YES_BUTTON_LABEL)),
- reject_label_(l10n_util::GetString(
- IDS_CONFIRM_MESSAGEBOX_NO_BUTTON_LABEL)) {
+ confirm_label_(UTF16ToWide(l10n_util::GetStringUTF16(
+ IDS_CONFIRM_MESSAGEBOX_YES_BUTTON_LABEL))),
+ reject_label_(UTF16ToWide(l10n_util::GetStringUTF16(
+ IDS_CONFIRM_MESSAGEBOX_NO_BUTTON_LABEL))) {
message_label_ = new views::Label(message_text);
message_label_->SetMultiLine(true);
message_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);

Powered by Google App Engine
This is Rietveld 408576698