diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-02 03:04:18 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-02 03:04:18 +0000 |
| commit | c7893dcb2c31af076f8051af5bbaaebb18460273 (patch) | |
| tree | 2f1220af1648ae6cac12262f80251bd08277a883 /chrome/browser | |
| parent | ac2ee1be96fedf8b9f752521ed23044894b11fe6 (diff) | |
| download | chromium_src-c7893dcb2c31af076f8051af5bbaaebb18460273.zip chromium_src-c7893dcb2c31af076f8051af5bbaaebb18460273.tar.gz chromium_src-c7893dcb2c31af076f8051af5bbaaebb18460273.tar.bz2 | |
views: Do not convert from utf16 to wide in CriticalNotificationBubbleView.
BUG=23581
R=pkasting@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10263013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134864 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/ui/views/critical_notification_bubble_view.cc | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/chrome/browser/ui/views/critical_notification_bubble_view.cc b/chrome/browser/ui/views/critical_notification_bubble_view.cc index 7328df0..ecf88f7 100644 --- a/chrome/browser/ui/views/critical_notification_bubble_view.cc +++ b/chrome/browser/ui/views/critical_notification_bubble_view.cc @@ -70,14 +70,14 @@ int CriticalNotificationBubbleView::GetRemainingTime() { void CriticalNotificationBubbleView::UpdateBubbleHeadline(int seconds) { if (seconds > 0) { - headline_->SetText(UTF16ToWide( + headline_->SetText( l10n_util::GetStringFUTF16(IDS_CRITICAL_NOTIFICATION_HEADLINE, l10n_util::GetStringUTF16(IDS_PRODUCT_NAME), - base::IntToString16(seconds)))); + base::IntToString16(seconds))); } else { - headline_->SetText(UTF16ToWide( + headline_->SetText( l10n_util::GetStringFUTF16(IDS_CRITICAL_NOTIFICATION_HEADLINE_ALTERNATE, - l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)))); + l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); } } @@ -194,11 +194,10 @@ void CriticalNotificationBubbleView::Init() { views::Label* message = new views::Label(); message->SetMultiLine(true); message->SetHorizontalAlignment(views::Label::ALIGN_LEFT); - message->SetText(UTF16ToWide( - l10n_util::GetStringFUTF16(IDS_CRITICAL_NOTIFICATION_TEXT, - l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)))); + message->SetText(l10n_util::GetStringFUTF16(IDS_CRITICAL_NOTIFICATION_TEXT, + l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); message->SizeToFit(views::Widget::GetLocalizedContentsWidth( - IDS_CRUCIAL_NOTIFICATION_BUBBLE_WIDTH_CHARS)); + IDS_CRUCIAL_NOTIFICATION_BUBBLE_WIDTH_CHARS)); layout->AddView(message); const int bottom_column_set_id = 2; @@ -213,12 +212,11 @@ void CriticalNotificationBubbleView::Init() { 0, kMessageBubblePadding); restart_button_ = new views::NativeTextButton(this, - UTF16ToWide(l10n_util::GetStringUTF16( - IDS_CRITICAL_NOTIFICATION_RESTART))); + l10n_util::GetStringUTF16(IDS_CRITICAL_NOTIFICATION_RESTART)); restart_button_->SetIsDefault(true); layout->AddView(restart_button_); - dismiss_button_ = new views::NativeTextButton(this, UTF16ToWide( - l10n_util::GetStringUTF16(IDS_CRITICAL_NOTIFICATION_DISMISS))); + dismiss_button_ = new views::NativeTextButton(this, + l10n_util::GetStringUTF16(IDS_CRITICAL_NOTIFICATION_DISMISS)); layout->AddView(dismiss_button_); refresh_timer_.Start(FROM_HERE, |