Use ICU plural syntax in more place

chrome/browser/ui/views/download/download_in_progress_dialog_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/download/download_in_progress_dialog_view.h"
 
 #include <algorithm>
 
 #include "base/strings/string_number_conversions.h"
 #include "chrome/grit/chromium_strings.h"
@@ skipping 20 matching lines @@
 
 DownloadInProgressDialogView::DownloadInProgressDialogView(
     int download_count,
     Browser::DownloadClosePreventionType dialog_type,
     bool app_modal,
     const base::Callback<void(bool)>& callback)
     : app_modal_(app_modal),
       callback_(callback),
       message_box_view_(NULL) {
   base::string16 explanation_text;
   switch (dialog_type) {

[Peter Kasting, 2015/05/12 21:52:03]

Nit: Simpler:

  DCHECK_NE(Browser::DOWNLOAD_CLOSE_OK, dialog_type);
  base::string16 explanation_text(l10n_util::GetPluralStringFUTF16(
      (dialog_type == Browser::DOWNLOAD_CLOSE_BROWSER_SHUTDOWN)
          ? IDS_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION
          : IDS_INCOGNITO_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION,
      download_count));

     case Browser::DOWNLOAD_CLOSE_BROWSER_SHUTDOWN:
-      if (download_count == 1) {
-        title_text_ = l10n_util::GetStringUTF16(
-            IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_TITLE);
-        explanation_text = l10n_util::GetStringUTF16(
-            IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION);
-      } else {
-        title_text_ = l10n_util::GetStringUTF16(
-            IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_TITLE);
-        explanation_text = l10n_util::GetStringUTF16(
-            IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_EXPLANATION);
-      }
-      ok_button_text_ = l10n_util::GetStringUTF16(
-          IDS_DOWNLOAD_REMOVE_CONFIRM_OK_BUTTON_LABEL);
+      explanation_text = l10n_util::GetPluralStringFUTF16(
+          IDS_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION, download_count);
       break;
     case Browser::DOWNLOAD_CLOSE_LAST_WINDOW_IN_INCOGNITO_PROFILE:
-      if (download_count == 1) {
-        title_text_ = l10n_util::GetStringUTF16(
-            IDS_SINGLE_INCOGNITO_DOWNLOAD_REMOVE_CONFIRM_TITLE);
-        explanation_text = l10n_util::GetStringUTF16(
-            IDS_SINGLE_INCOGNITO_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION);
-      } else {
-        title_text_ = l10n_util::GetStringUTF16(
-            IDS_MULTIPLE_INCOGNITO_DOWNLOADS_REMOVE_CONFIRM_TITLE);
-        explanation_text = l10n_util::GetStringUTF16(
-            IDS_MULTIPLE_INCOGNITO_DOWNLOADS_REMOVE_CONFIRM_EXPLANATION);
-      }
-      ok_button_text_ = l10n_util::GetStringUTF16(
-          IDS_INCOGNITO_DOWNLOAD_REMOVE_CONFIRM_OK_BUTTON_LABEL);
+      explanation_text = l10n_util::GetPluralStringFUTF16(
+          IDS_INCOGNITO_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION, download_count);
       break;
     default:
       // This dialog should have been created within the same thread invocation
       // as the original test that lead to us, so it should always not be ok
       // to close.
       NOTREACHED();
   }
-  cancel_button_text_ = l10n_util::GetStringUTF16(
-      IDS_DOWNLOAD_REMOVE_CONFIRM_CANCEL_BUTTON_LABEL);
+  title_text_ = l10n_util::GetPluralStringFUTF16(
+      IDS_DOWNLOAD_REMOVE_CONFIRM_TITLE, download_count);
+  ok_button_text_ = l10n_util::GetPluralStringFUTF16(
+      IDS_DOWNLOAD_REMOVE_CONFIRM_OK_BUTTON_LABEL, download_count);
+  cancel_button_text_ = l10n_util::GetPluralStringFUTF16(
+      IDS_DOWNLOAD_REMOVE_CONFIRM_CANCEL_BUTTON_LABEL, download_count);
 
   message_box_view_ = new views::MessageBoxView(
       views::MessageBoxView::InitParams(explanation_text));
 }
 
 DownloadInProgressDialogView::~DownloadInProgressDialogView() {}
 
 int DownloadInProgressDialogView::GetDefaultDialogButton() const {
   return ui::DIALOG_BUTTON_CANCEL;
 }
@@ skipping 30 matching lines @@
   return message_box_view_->GetWidget();
 }
 
 const views::Widget* DownloadInProgressDialogView::GetWidget() const {
   return message_box_view_->GetWidget();
 }
 
 views::View* DownloadInProgressDialogView::GetContentsView() {
   return message_box_view_;
 }