Report print jobs that are aborted by CUPS as errors.

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 66 matching lines @@
       base::string16(),  // display_source
       GURL(kCupsPrintJobNotificationId),
       notification_id_,  // tag
       message_center::RichNotificationData(), delegate_.get()));
   UpdateNotification();
 }
 
 CupsPrintJobNotification::~CupsPrintJobNotification() {}
 
 void CupsPrintJobNotification::OnPrintJobStatusUpdated() {
+  // After cancellation, ignore all updates.
+  if (cancelled_by_user_)
+    return;
+

[xdai1, 2017/02/24 19:17:00]

I think we're not supposed to get any updates after the print job is cancelled
by user?

[skau, 2017/02/24 23:09:34]

The previous behavior was that we never received any events that indicated
cancellation.  I could suppress the CANCELLED events but it would require
deleting the CupsPrintJob object at an unpredictable time.  This is safer.

   UpdateNotification();
 }
 
 void CupsPrintJobNotification::CloseNotificationByUser() {
   closed_in_middle_ = true;
   g_browser_process->message_center()->RemoveNotification(GetNotificationId(),
                                                           true /* by_user */);
 }
 
 void CupsPrintJobNotification::ClickOnNotificationButton(int button_index) {
   DCHECK(button_index >= 0 &&
          static_cast<size_t>(button_index) < button_commands_->size());
 
   CupsPrintJobNotification::ButtonCommand button_command =
       button_commands_->at(button_index);
   CupsPrintJobManager* print_job_manager =
       CupsPrintJobManagerFactory::GetForBrowserContext(profile_);
   const ProfileID profile_id = NotificationUIManager::GetProfileID(profile_);
 
   switch (button_command) {
     case ButtonCommand::CANCEL_PRINTING:
       if (print_job_manager->CancelPrintJob(print_job_)) {
         // only clean up the nofitication if cancel was successful.
         g_browser_process->notification_ui_manager()->CancelById(
             GetNotificationId(), profile_id);
-        // |print_job_| is deleted by CupsPrintManager when the print job is
-        // cancelled, thus set it to nullptr.
-        print_job_ = nullptr;
+        cancelled_by_user_ = true;
       }
       break;
     case ButtonCommand::PAUSE_PRINTING:
       print_job_manager->SuspendPrintJob(print_job_);
       break;
     case ButtonCommand::RESUME_PRINTING:
       print_job_manager->ResumePrintJob(print_job_);
       break;
     case ButtonCommand::GET_HELP:
       break;
   }
 }
 
 const std::string& CupsPrintJobNotification::GetNotificationId() {
   return notification_id_;
 }
 
 void CupsPrintJobNotification::UpdateNotification() {
-  DCHECK(print_job_->state() != CupsPrintJob::State::STATE_CANCELLED);
-
   UpdateNotificationTitle();
   UpdateNotificationIcon();
   UpdateNotificationBodyMessage();
   UpdateNotificationType();
   UpdateNotificationButtons();
 
   // |STATE_PAGE_DONE| is special since if the user closes the notification in
   // the middle, which means they're not interested in the printing progress, we
   // should prevent showing the following printing progress.
   if (print_job_->state() == CupsPrintJob::State::STATE_PAGE_DONE) {
@@ skipping 32 matching lines @@
     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));
-      break;
-    default:
+    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:
@@ skipping 11 matching lines @@
           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;
   }
   notification_->set_message(message);
 }
 
 void CupsPrintJobNotification::UpdateNotificationType() {
   switch (print_job_->state()) {
     case CupsPrintJob::State::STATE_STARTED:
     case CupsPrintJob::State::STATE_PAGE_DONE:
     case CupsPrintJob::State::STATE_SUSPENDED:
     case CupsPrintJob::State::STATE_RESUMED:
       notification_->set_type(message_center::NOTIFICATION_TYPE_PROGRESS);
       notification_->set_progress(print_job_->printed_page_number() * 100 /
                                   print_job_->total_page_number());
       break;
     case CupsPrintJob::State::STATE_NONE:
     case CupsPrintJob::State::STATE_WAITING:
     case CupsPrintJob::State::STATE_DOCUMENT_DONE:
     case CupsPrintJob::State::STATE_ERROR:
-    default:
+    case CupsPrintJob::State::STATE_CANCELLED:
       notification_->set_type(message_center::NOTIFICATION_TYPE_SIMPLE);
       break;
   }
 }
 
 void CupsPrintJobNotification::UpdateNotificationButtons() {
   std::vector<message_center::ButtonInfo> buttons;
   button_commands_ = GetButtonCommands();
   for (auto& it : *button_commands_) {
     message_center::ButtonInfo button_info =
@@ skipping 13 matching lines @@
       commands->push_back(ButtonCommand::CANCEL_PRINTING);
       break;
     case CupsPrintJob::State::STATE_STARTED:
     case CupsPrintJob::State::STATE_PAGE_DONE:
     case CupsPrintJob::State::STATE_RESUMED:
     case CupsPrintJob::State::STATE_SUSPENDED:
       // TODO(crbug.com/679927): Add PAUSE and RESUME buttons.
       commands->push_back(ButtonCommand::CANCEL_PRINTING);
       break;
     case CupsPrintJob::State::STATE_ERROR:
+    case CupsPrintJob::State::STATE_CANCELLED:
       commands->push_back(ButtonCommand::GET_HELP);
       break;
     default:
       break;
   }
   return commands;
 }
 
 base::string16 CupsPrintJobNotification::GetButtonLabel(
     ButtonCommand button) const {
@@ skipping 27 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