i18n of several browser messages

chrome/browser/ui/views/critical_notification_bubble_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/critical_notification_bubble_view.h"
 
-#include "base/strings/string_number_conversions.h"
+#include "base/i18n/message_formatter.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/upgrade_detector.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/user_metrics.h"
@@ skipping 58 matching lines @@
 
   // Update the counter. It may seem counter-intuitive to update the message
   // after we attempt restart, but remember that shutdown may be aborted by
   // an onbeforeunload handler, leaving the bubble up when the browser should
   // have restarted (giving the user another chance).
   GetBubbleFrameView()->UpdateWindowTitle();
 }
 
 base::string16 CriticalNotificationBubbleView::GetWindowTitle() const {
   int seconds = GetRemainingTime();
-  return seconds > 0 ? l10n_util::GetStringFUTF16(
-                           IDS_CRITICAL_NOTIFICATION_HEADLINE,
-                           l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
-                           base::IntToString16(seconds))
+  return seconds > 0 ? base::i18n::MessageFormatter::FormatWithNumberedArgs(
+                           l10n_util::GetStringUTF16(
+                               IDS_CRITICAL_NOTIFICATION_HEADLINE),
+                           l10n_util::GetStringUTF16(IDS_PRODUCT_NAME), seconds)
                      : l10n_util::GetStringFUTF16(
                            IDS_CRITICAL_NOTIFICATION_HEADLINE_ALTERNATE,
                            l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
 }
 
 gfx::ImageSkia CriticalNotificationBubbleView::GetWindowIcon() {
   return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
       IDR_UPDATE_MENU_SEVERITY_HIGH);
 }
 
@@ skipping 55 matching lines @@
 void CriticalNotificationBubbleView::GetAccessibleState(
     ui::AXViewState* state) {
   state->role = ui::AX_ROLE_ALERT;
 }
 
 void CriticalNotificationBubbleView::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   if (details.is_add && details.child == this)
     NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
 }