Mac Web Intents Part 1: Show extension download progress

chrome/browser/ui/intents/web_intent_picker_controller.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/intents/web_intent_picker_controller.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 21 matching lines @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/constrained_window_tab_helper.h"
 #include "chrome/browser/ui/intents/web_intent_picker.h"
 #include "chrome/browser/ui/intents/web_intent_picker_model.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/download_manager.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_intents_dispatcher.h"
 #include "grit/generated_resources.h"
 #include "ipc/ipc_message.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
@@ skipping 412 matching lines @@
 }
 
 void WebIntentPickerController::OnInlineDispositionWebContentsCreated(
     content::WebContents* web_contents) {
   if (web_contents)
     intents_dispatcher_->DispatchIntent(web_contents);
 }
 
 void WebIntentPickerController::OnExtensionInstallRequested(
     const std::string& id) {
+  picker_model_->SetPendingExtensionInstallId(id);
+
   scoped_ptr<WebstoreInstaller::Approval> approval(
       WebstoreInstaller::Approval::CreateWithInstallPrompt(profile_));
 
   scoped_refptr<WebstoreInstaller> installer = new WebstoreInstaller(
       profile_, this,
       &web_contents_->GetController(), id,
       approval.Pass(), WebstoreInstaller::FLAG_INLINE_INSTALL);
 
   pending_async_count_++;
   installer->Start();
@@ skipping 37 matching lines @@
 
 void WebIntentPickerController::OnChooseAnotherService() {
   DCHECK(intents_dispatcher_);
   web_intents::RecordChooseAnotherService(uma_bucket_);
   intents_dispatcher_->ResetDispatch();
 }
 
 void WebIntentPickerController::OnClosing() {
   SetDialogState(kPickerHidden);
   picker_ = NULL;
+  CancelDownload(std::string(), WebstoreInstaller::FAILURE_REASON_CANCELLED);
 #if defined(TOOLKIT_VIEWS)
   if (cancelled_)
     OnUserCancelledPickerDialog();
 #endif
 }
 
+void WebIntentPickerController::OnExtensionDownloadStarted(
+    const std::string& id,
+    content::DownloadItem* item) {
+  item->SetIsHiddenDownload(true);
+  download_id_ = item->GetGlobalId();
+  picker_model_->UpdateExtensionDownloadState(item);
+}
+
+void WebIntentPickerController::OnExtensionDownloadProgress(
+    const std::string& id,
+    content::DownloadItem* item) {
+  picker_model_->UpdateExtensionDownloadState(item);
+}
+
 void WebIntentPickerController::OnExtensionInstallSuccess(
     const std::string& extension_id) {
   // OnExtensionInstallSuccess is called via NotificationService::Notify before
   // the extension is added to the ExtensionService. Dispatch via PostTask to
   // allow ExtensionService to update.
   MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(
           &WebIntentPickerController::DispatchToInstalledExtension,
           base::Unretained(this),
           extension_id));
 }
 
 void WebIntentPickerController::DispatchToInstalledExtension(
     const std::string& extension_id) {
   web_intents::RecordCWSExtensionInstalled(uma_bucket_);
-  picker_->OnExtensionInstallSuccess(extension_id);
+
+  download_id_ = content::DownloadId();
+  picker_model_->ClearPendingExtensionInstall();
+  if (picker_)
+    picker_->OnExtensionInstallSuccess(extension_id);
+
   WebIntentsRegistry::IntentServiceList services;
   GetWebIntentsRegistry(profile_)->GetIntentServicesForExtensionFilter(
       picker_model_->action(), picker_model_->type(),
       extension_id,
       &services);
 
   // Extension must be registered with registry by now.
   DCHECK(services.size() > 0);
 
   // TODO(binji): We're going to need to disambiguate if there are multiple
   // services. For now, just choose the first.
   const webkit_glue::WebIntentServiceData& service_data = services[0];
 
   picker_model_->AddInstalledService(
       service_data.title, service_data.service_url,
       service_data.disposition);
   OnServiceChosen(service_data.service_url, service_data.disposition);
   AsyncOperationFinished();
 }
 
 void WebIntentPickerController::OnExtensionInstallFailure(
     const std::string& id,
-    const std::string& error) {
-  picker_->OnExtensionInstallFailure(id);
+    const std::string& error,
+    WebstoreInstaller::FailureReason reason) {
+  CancelDownload(error, reason);

[asanka, 2012/10/02 21:08:37]

If the extension install failed due to a reason other than the download being
interrupted or cancelled, then wouldn't calling CancelDownload() here cause a
re-entry to OnExtensionInstallFailure()?

[sail, 2012/10/02 21:48:26]

Done.
I see what you mean, removed.
(I'll retest the extension unpack failure. If it's a problem I can fix it in
separate CL).

+  if (picker_)
+    picker_->OnExtensionInstallFailure(id);
   AsyncOperationFinished();
 }
 
 void WebIntentPickerController::OnSendReturnMessage(
     webkit_glue::WebIntentReplyType reply_type) {
   ClosePicker();
   uma_reporter_->RecordServiceActiveDuration(reply_type);
 
   if (service_tab_ &&
       reply_type != webkit_glue::WEB_INTENT_SERVICE_CONTENTS_CLOSED) {
@@ skipping 469 matching lines @@
   web_intents::RecordPickerShow(
       uma_bucket_, picker_model_->GetInstalledServiceCount());
   picker_shown_ = true;
 }
 
 void WebIntentPickerController::ClosePicker() {
   SetDialogState(kPickerHidden);
   if (picker_)
     picker_->Close();
 }
+
+void WebIntentPickerController::CancelDownload(
+    const std::string& error,
+    WebstoreInstaller::FailureReason reason) {
+  // If the user cancelled the install then don't show an error message.
+  if (reason == WebstoreInstaller::FAILURE_REASON_CANCELLED)
+    picker_model_->ClearPendingExtensionInstall();
+  else
+    picker_model_->SetPendingExtensionInstallStatusString(UTF8ToUTF16(error));
+
+  if (!download_id_.IsValid())
+    return;
+  Profile* profile =
+      Profile::FromBrowserContext(web_contents_->GetBrowserContext());
+  content::DownloadManager* download_manager =
+      content::BrowserContext::GetDownloadManager(profile);
+  if (!download_manager)
+    return;
+  content::DownloadItem* item =
+      download_manager->GetDownload(download_id_.local());
+  if (item)
+    item->Cancel(true);
+  download_id_ = content::DownloadId();
+}