Change policy to not trigger dangerous download UI for web intents dispatched files.

chrome/browser/download/chrome_download_manager_delegate.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/download/chrome_download_manager_delegate.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 29 matching lines @@
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_intents_dispatcher.h"
 #include "grit/generated_resources.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "webkit/glue/web_intent_data.h"
+#include "webkit/glue/web_intent_reply_data.h"
 
 #if !defined(OS_ANDROID)
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/gdata/gdata_download_observer.h"
 #include "chrome/browser/chromeos/gdata/gdata_util.h"
 #include "chrome/browser/download/download_file_picker_chromeos.h"
@@ skipping 305 matching lines @@
     return false;
   }
 
   return true;
 }
 
 bool ChromeDownloadManagerDelegate::ShouldOpenWithWebIntents(
     const DownloadItem* item) {
   if (!item->GetWebContents() || !item->GetWebContents()->GetDelegate())
     return false;
+  if (!item->GetForcedFilePath().empty())
+    return false;
 
   std::string mime_type = item->GetMimeType();
   if (mime_type == "application/rss+xml" ||
       mime_type == "application/atom+xml") {
     return true;
   }
 
 #if defined(OS_CHROMEOS)
   if (mime_type == "application/msword" ||
       mime_type == "application/vnd.ms-powerpoint" ||
       mime_type == "application/vnd.ms-excel" ||
       mime_type == "application/vnd.openxmlformats-officedocument."
                    "wordprocessingml.document" ||
       mime_type == "application/vnd.openxmlformats-officedocument."
                    "presentationml.presentation" ||
       mime_type == "application/vnd.openxmlformats-officedocument."
                    "spreadsheetml.sheet") {
     return true;
   }
 #endif  // defined(OS_CHROMEOS)
 
   return false;
 }
 
+// Needed to give PostTask a void closure in OnWebIntentDispatchCompleted.
+void DeleteFile(const FilePath& file_path) {

[asanka, 2012/08/16 18:27:25]

Nit: Move to anonymous namespace.

[Greg Billock, 2012/08/16 21:29:51]

Done.

+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+  file_util::Delete(file_path, false);
+}
+
+// Called when the web intents dispatch has completed. Deletes the |file_path|.
+void OnWebIntentDispatchCompleted(

[asanka, 2012/08/16 18:27:25]

Nit: This as well.

[Greg Billock, 2012/08/16 21:29:51]

Done.

+    const FilePath& file_path,
+    webkit_glue::WebIntentReplyType intent_reply) {
+  BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
+                          base::Bind(&DeleteFile, file_path));
+}
+
 void ChromeDownloadManagerDelegate::OpenWithWebIntent(
     const DownloadItem* item) {
   webkit_glue::WebIntentData intent_data(
       ASCIIToUTF16("http://webintents.org/view"),
       ASCIIToUTF16(item->GetMimeType()),
       item->GetFullPath(),
       item->GetReceivedBytes());
 
   // RCH specifies that the receiver gets the url, but with Web Intents
   // it isn't really needed.
   intent_data.extra_data.insert(make_pair(
       ASCIIToUTF16("url"), ASCIIToUTF16(item->GetURL().spec())));
 
   // Pass the downloaded filename to the service app as the name hint.
-  intent_data.extra_data.insert(
-      make_pair(ASCIIToUTF16("filename"),
-                item->GetFileNameToReportUser().LossyDisplayName()));
+  string16 display_name = item->GetFileNameToReportUser().LossyDisplayName();
+  ReplaceFirstSubstringAfterOffset(&display_name, display_name.length() - 11,

[asanka, 2012/08/16 18:27:25]

See comment below about display names.

[Greg Billock, 2012/08/16 21:29:51]

Done.

+                                   ASCIIToUTF16(".webintents"), string16());
+  intent_data.extra_data.insert(make_pair(ASCIIToUTF16("filename"),
+                                          display_name));
 
   content::WebIntentsDispatcher* dispatcher =
       content::WebIntentsDispatcher::Create(intent_data);
+  dispatcher->RegisterReplyNotification(
+      base::Bind(&OnWebIntentDispatchCompleted, item->GetFullPath()));
   // TODO(gbillock): try to get this to be able to delegate to the Browser
   // object directly, passing a NULL WebContents?
   item->GetWebContents()->GetDelegate()->WebIntentDispatch(
       item->GetWebContents(), dispatcher);
 }
 
 bool ChromeDownloadManagerDelegate::GenerateFileHash() {
 #if defined(ENABLE_SAFE_BROWSING)
   return profile_->GetPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled) &&
       g_browser_process->safe_browsing_service()->DownloadBinHashNeeded();
@@ skipping 261 matching lines @@
     if (should_prompt && !last_download_path_.empty())
       target_directory = last_download_path_;
     else
       target_directory = download_prefs_->DownloadPath();
     suggested_path = target_directory.Append(generated_name);
   } else {
     DCHECK(!should_prompt);
     suggested_path = download->GetForcedFilePath();
   }
 
+  // If we will open the file with a web intents dispatch,
+  // give it a name that will not allow the OS to open it using usual
+  // associated apps.
+  if (ShouldOpenWithWebIntents(download)) {
+    suggested_path = suggested_path.AddExtension(".webintents");

[asanka, 2012/08/16 18:27:25]

I suggest calling download->SetDisplayName(suggested_path.BaseName())
beforehand. This will set the display name of the download to the suggested
name.

Setting the display name affects the name shown in the download shelf as well
what is returned by DownloadItem::GetFileNameToReportUser(). So you can get rid
of the logic in OpenWithWebIntent() to remove the ".webintents" extension.

[asanka, 2012/08/16 18:27:25]

Also, consider using a named constant for the ".webintents" extension.

[Greg Billock, 2012/08/16 21:29:51]

Done.

[Greg Billock, 2012/08/16 21:29:51]

Got it. Yes. That's very nice.

On 2012/08/16 18:27:25, asanka wrote:

+  }
+
   // If the download hasn't already been marked dangerous (could be
   // DANGEROUS_URL), check if it is a dangerous file.
   if (danger_type == content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS) {
     if (!should_prompt && !is_forced_path &&
         IsDangerousFile(*download, suggested_path, visited_referrer_before)) {
       danger_type = content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE;
     }
 
 #if defined(ENABLE_SAFE_BROWSING)
     DownloadProtectionService* service = GetDownloadProtectionService();
@@ skipping 119 matching lines @@
     int32 download_id, int64 db_handle) {
   // It's not immediately obvious, but HistoryBackend::CreateDownload() can
   // call this function with an invalid |db_handle|. For instance, this can
   // happen when the history database is offline. We cannot have multiple
   // DownloadItems with the same invalid db_handle, so we need to assign a
   // unique |db_handle| here.
   if (db_handle == DownloadItem::kUninitializedHandle)
     db_handle = download_history_->GetNextFakeDbHandle();
   download_manager_->OnItemAddedToPersistentStore(download_id, db_handle);
 }