[CUPS] Update UI for CUPS printing notifications.

chrome/browser/chromeos/printing/cups_print_job_notification.cc

 // Copyright 2016 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/chromeos/printing/cups_print_job_notification.h"
 
 #include <memory>
 #include <string>
 #include <vector>
 
@@ skipping 163 matching lines @@
     g_browser_process->notification_ui_manager()->Add(*notification_, profile_);
   }
 
   // |print_job_| will be deleted by CupsPrintJobManager if the job is finished
   // and we are not supposed to get any notification update after that.
   if (print_job_->IsJobFinished())
     print_job_ = nullptr;
 }
 
 void CupsPrintJobNotification::UpdateNotificationTitle() {
-  notification_->set_title(base::UTF8ToUTF16(print_job_->document_title()));
+  base::string16 title;
+  switch (print_job_->state()) {
+    case CupsPrintJob::State::STATE_WAITING:
+    case CupsPrintJob::State::STATE_STARTED:
+    case CupsPrintJob::State::STATE_PAGE_DONE:
+    case CupsPrintJob::State::STATE_SUSPENDED:
+    case CupsPrintJob::State::STATE_RESUMED:
+      title = l10n_util::GetStringFUTF16(
+          IDS_PRINT_JOB_PRINTING_NOTIFICATION_TITLE,
+          base::UTF8ToUTF16(print_job_->document_title()));
+      break;
+    case CupsPrintJob::State::STATE_DOCUMENT_DONE:
+      title = l10n_util::GetStringFUTF16(
+          IDS_PRINT_JOB_DONE_NOTIFICATION_TITLE,
+          base::UTF8ToUTF16(print_job_->document_title()));
+      break;
+    case CupsPrintJob::State::STATE_CANCELLED:
+    case CupsPrintJob::State::STATE_ERROR:
+      title = l10n_util::GetStringFUTF16(
+          IDS_PRINT_JOB_ERROR_NOTIFICATION_TITLE,
+          base::UTF8ToUTF16(print_job_->document_title()));
+      break;
+    default:
+      break;
+  }
+  notification_->set_title(title);
 }
 
 void CupsPrintJobNotification::UpdateNotificationIcon() {
   ResourceBundle& bundle = ResourceBundle::GetSharedInstance();
   switch (print_job_->state()) {
     case CupsPrintJob::State::STATE_WAITING:
     case CupsPrintJob::State::STATE_STARTED:
     case CupsPrintJob::State::STATE_PAGE_DONE:
     case CupsPrintJob::State::STATE_SUSPENDED:
     case CupsPrintJob::State::STATE_RESUMED:
       notification_->set_icon(
           bundle.GetImageNamed(IDR_PRINT_NOTIFICATION_PRINTING));
       break;
     case CupsPrintJob::State::STATE_DOCUMENT_DONE:
       notification_->set_icon(
           bundle.GetImageNamed(IDR_PRINT_NOTIFICATION_DONE));
       break;
     case CupsPrintJob::State::STATE_CANCELLED:
     case CupsPrintJob::State::STATE_ERROR:
       notification_->set_icon(
           bundle.GetImageNamed(IDR_PRINT_NOTIFICATION_ERROR));
     case CupsPrintJob::State::STATE_NONE:
       break;
   }
 }
 
 void CupsPrintJobNotification::UpdateNotificationBodyMessage() {
-  base::string16 message;
-  switch (print_job_->state()) {
-    case CupsPrintJob::State::STATE_NONE:
-      break;
-    case CupsPrintJob::State::STATE_WAITING:
-    case CupsPrintJob::State::STATE_STARTED:
-    case CupsPrintJob::State::STATE_PAGE_DONE:
-    case CupsPrintJob::State::STATE_SUSPENDED:
-    case CupsPrintJob::State::STATE_RESUMED:
-      message = l10n_util::GetStringFUTF16(
-          IDS_PRINT_JOB_PRINTING_NOTIFICATION_MESSAGE,
-          base::IntToString16(print_job_->total_page_number()),
-          base::UTF8ToUTF16(print_job_->printer().display_name()));
-
-      break;
-    case CupsPrintJob::State::STATE_DOCUMENT_DONE:
-      message = l10n_util::GetStringFUTF16(
-          IDS_PRINT_JOB_DONE_NOTIFICATION_MESSAGE,
-          base::IntToString16(print_job_->total_page_number()),
-          base::UTF8ToUTF16(print_job_->printer().display_name()));
-      break;
-    case CupsPrintJob::State::STATE_CANCELLED:
-    case CupsPrintJob::State::STATE_ERROR:
-      message = l10n_util::GetStringFUTF16(
-          IDS_PRINT_JOB_ERROR_NOTIFICATION_MESSAGE,
-          base::IntToString16(print_job_->total_page_number()),
-          base::UTF8ToUTF16(print_job_->printer().display_name()));
-      break;
-    default:
-      break;
-  }
+  base::string16 message = l10n_util::GetStringFUTF16(
+      (print_job_->total_page_number() > 1)
+          ? IDS_PRINT_JOB_NOTIFICATION_MESSAGE
+          : IDS_PRINT_JOB_NOTIFICATION_SINGLE_PAGE_MESSAGE,
+      base::IntToString16(print_job_->total_page_number()),
+      base::UTF8ToUTF16(print_job_->printer().display_name()));
   notification_->set_message(message);
 }
 
 void CupsPrintJobNotification::UpdateNotificationType() {
   switch (print_job_->state()) {
     case CupsPrintJob::State::STATE_WAITING:
     case CupsPrintJob::State::STATE_STARTED:
     case CupsPrintJob::State::STATE_PAGE_DONE:
     case CupsPrintJob::State::STATE_SUSPENDED:
     case CupsPrintJob::State::STATE_RESUMED:
@@ skipping 79 matching lines @@
       icon = bundle.GetImageNamed(IDR_PRINT_NOTIFICATION_PLAY);
       break;
     case ButtonCommand::GET_HELP:
       icon = bundle.GetImageNamed(IDR_PRINT_NOTIFICATION_HELP);
       break;
   }
   return icon;
 }
 
 }  // namespace chromeos