ICU msg format support with more than one arguments

extensions/browser/api/device_permissions_prompt.cc

 // Copyright 2014 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 "extensions/browser/api/device_permissions_prompt.h"
 
 #include "base/bind.h"
+#include "base/i18n/message_formatter.h"
 #include "base/scoped_observer.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "device/core/device_client.h"
 #include "device/hid/hid_device_filter.h"
 #include "device/hid/hid_device_info.h"
 #include "device/hid/hid_service.h"
 #include "device/usb/usb_device.h"
 #include "device/usb/usb_device_filter.h"
 #include "device/usb/usb_ids.h"
@@ skipping 66 matching lines @@
       UsbService* service = device::DeviceClient::Get()->GetUsbService();
       if (service && !service_observer_.IsObserving(service)) {
         service->GetDevices(
             base::Bind(&UsbDevicePermissionsPrompt::OnDevicesEnumerated, this));
         service_observer_.Add(service);
       }
     }
   }
 
   base::string16 GetHeading() const override {
-    return l10n_util::GetStringUTF16(
-        multiple() ? IDS_USB_DEVICE_PERMISSIONS_PROMPT_TITLE_MULTIPLE
-                   : IDS_USB_DEVICE_PERMISSIONS_PROMPT_TITLE_SINGLE);
+    return l10n_util::GetSingleOrMultipleStringUTF16(
+        IDS_USB_DEVICE_PERMISSIONS_PROMPT_TITLE, multiple());
   }
 
   void Dismissed() override {
     DevicePermissionsManager* permissions_manager =
         DevicePermissionsManager::Get(browser_context());
     std::vector<scoped_refptr<UsbDevice>> devices;
     for (const DeviceInfo* device : devices_) {
       if (device->granted()) {
         const UsbDeviceInfo* usb_device =
             static_cast<const UsbDeviceInfo*>(device);
@@ skipping 92 matching lines @@
       HidService* service = device::DeviceClient::Get()->GetHidService();
       if (service && !service_observer_.IsObserving(service)) {
         service->GetDevices(
             base::Bind(&HidDevicePermissionsPrompt::OnDevicesEnumerated, this));
         service_observer_.Add(service);
       }
     }
   }
 
   base::string16 GetHeading() const override {
-    return l10n_util::GetStringUTF16(
-        multiple() ? IDS_HID_DEVICE_PERMISSIONS_PROMPT_TITLE_MULTIPLE
-                   : IDS_HID_DEVICE_PERMISSIONS_PROMPT_TITLE_SINGLE);
+    return l10n_util::GetSingleOrMultipleStringUTF16(
+        IDS_HID_DEVICE_PERMISSIONS_PROMPT_TITLE, multiple());
   }
 
   void Dismissed() override {
     DevicePermissionsManager* permissions_manager =
         DevicePermissionsManager::Get(browser_context());
     std::vector<scoped_refptr<device::HidDeviceInfo>> devices;
     for (const DeviceInfo* device : devices_) {
       if (device->granted()) {
         const HidDeviceInfo* hid_device =
             static_cast<const HidDeviceInfo*>(device);
@@ skipping 79 matching lines @@
                                         content::BrowserContext* context,
                                         bool multiple)
     : extension_(extension), browser_context_(context), multiple_(multiple) {
 }
 
 void DevicePermissionsPrompt::Prompt::SetObserver(Observer* observer) {
   observer_ = observer;
 }
 
 base::string16 DevicePermissionsPrompt::Prompt::GetPromptMessage() const {
-  return l10n_util::GetStringFUTF16(multiple_
-                                        ? IDS_DEVICE_PERMISSIONS_PROMPT_MULTIPLE
-                                        : IDS_DEVICE_PERMISSIONS_PROMPT_SINGLE,
-                                    base::UTF8ToUTF16(extension_->name()));
+  return base::i18n::MessageFormatter::FormatWithNumberedArgs(
+      l10n_util::GetStringUTF16(IDS_DEVICE_PERMISSIONS_PROMPT),
+      multiple_ ? "multiple" : "single", extension_->name());
 }
 
 base::string16 DevicePermissionsPrompt::Prompt::GetDeviceName(
     size_t index) const {
   DCHECK_LT(index, devices_.size());
   return devices_[index]->name();
 }
 
 base::string16 DevicePermissionsPrompt::Prompt::GetDeviceSerialNumber(
     size_t index) const {
@@ skipping 44 matching lines @@
     content::BrowserContext* context,
     bool multiple,
     const std::vector<HidDeviceFilter>& filters,
     const HidDevicesCallback& callback) {
   prompt_ = new HidDevicePermissionsPrompt(extension, context, multiple,
                                            filters, callback);
   ShowDialog();
 }
 
 }  // namespace extensions