[OfflinePages] Call NotifyInterrupted for pending requests

components/offline_pages/downloads/download_notifying_observer.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 "components/offline_pages/downloads/download_notifying_observer.h"
 
 #include "components/offline_pages/background/request_coordinator.h"
 #include "components/offline_pages/background/save_page_request.h"
 #include "components/offline_pages/client_policy_controller.h"
 #include "components/offline_pages/downloads/download_ui_adapter.h"
@@ skipping 29 matching lines @@
       std::move(notifier), request_coordinator->GetPolicyController());
   request_coordinator->AddObserver(observer);
   // |request_coordinator| takes ownership of observer here.
   request_coordinator->SetUserData(&kUserDataKey, observer);
 }
 
 void DownloadNotifyingObserver::OnAdded(const SavePageRequest& request) {
   DCHECK(notifier_.get());
   if (!IsVisibleInUI(request.client_id()))
     return;
+
+  // There is no Added call for the notifier so we perform a Progress call
+  // to cause the notification to be created.
   notifier_->NotifyDownloadProgress(DownloadUIItem(request));
+
+  // Now if the request state is available, we need to send Interrupted call.
+  // TODO(dougarnett): Handle request state in notifier impl so this call
+  // is not needed.
+  if (request.request_state() == SavePageRequest::RequestState::AVAILABLE)

[fgorski, 2016/11/28 22:30:24]

Here is the response to your previous comment that I didn't post soon enough:


That would make sense. I think what you want is to extract the code from
onChange (instead of calling it) and then call it from here if
(request.request_state() != SavePageRequest::RequestState::OFFLINING)

As you say, that ensures creation and then immediately puts a proper state
update on the notification.

[dougarnett, 2016/11/28 22:52:15]

Done.

Btw, chatted with Min and he does suggest going with this two call approach for
now.

+      notifier_->NotifyDownloadInterrupted(DownloadUIItem(request));
 }
 
 void DownloadNotifyingObserver::OnChanged(const SavePageRequest& request) {
   DCHECK(notifier_.get());
   if (!IsVisibleInUI(request.client_id()))
     return;
   if (request.request_state() == SavePageRequest::RequestState::PAUSED)
     notifier_->NotifyDownloadPaused(DownloadUIItem(request));
+  else if (request.request_state() == SavePageRequest::RequestState::AVAILABLE)
+    notifier_->NotifyDownloadInterrupted(DownloadUIItem(request));
   else
     notifier_->NotifyDownloadProgress(DownloadUIItem(request));
 }
 
 void DownloadNotifyingObserver::OnCompleted(
     const SavePageRequest& request,
     RequestCoordinator::BackgroundSavePageResult status) {
   DCHECK(notifier_.get());
   if (!IsVisibleInUI(request.client_id()))
     return;
   if (status == RequestCoordinator::BackgroundSavePageResult::SUCCESS)
     notifier_->NotifyDownloadSuccessful(DownloadUIItem(request));
   else if (status == RequestCoordinator::BackgroundSavePageResult::REMOVED)
     notifier_->NotifyDownloadCanceled(DownloadUIItem(request));
   else
     notifier_->NotifyDownloadFailed(DownloadUIItem(request));
 }
 
 bool DownloadNotifyingObserver::IsVisibleInUI(const ClientId& page) {
   return policy_controller_->IsSupportedByDownload(page.name_space) &&
          base::IsValidGUID(page.id);
 }
 
 }  // namespace offline_pages