Recommit r52848 - Option-click to download should not display "Save As" UI.

Review URL: http://codereview.chromium.org/2825056

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52850 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 9 insertions, 2 deletions

diff --git a/chrome/browser/renderer_host/download_resource_handler.cc b/chrome/browser/renderer_host/download_resource_handler.cc
index 0b45695..735a168 100644
--- a/chrome/browser/renderer_host/download_resource_handler.cc
+++ b/chrome/browser/renderer_host/download_resource_handler.cc
@@ -85,7 +85,8 @@ bool DownloadResourceHandler::OnResponseStarted(int request_id,
     content_type_header = "";
   info->original_mime_type = content_type_header;
 
-  info->save_as = save_as_ && save_info_.file_path.empty();
+  info->prompt_user_for_save_location =
+      save_as_ && save_info_.file_path.empty();
   info->is_dangerous = false;
   info->referrer_charset = request_->context()->referrer_charset();
   info->save_info = save_info_;
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.cc b/chrome/browser/renderer_host/resource_dispatcher_host.cc
index cca59a1..d3e80c8 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host.cc
@@ -599,6 +599,7 @@ void ResourceDispatcherHost::BeginDownload(
     const GURL& url,
     const GURL& referrer,
     const DownloadSaveInfo& save_info,
+    bool prompt_for_save_location,
     int child_id,
     int route_id,
     URLRequestContext* request_context) {
@@ -628,7 +629,7 @@ void ResourceDispatcherHost::BeginDownload(
                                   url,
                                   download_file_manager_.get(),
                                   request,
-                                  true,
+                                  prompt_for_save_location,
                                   save_info);
 
   if (safe_browsing_->enabled()) {
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.h b/chrome/browser/renderer_host/resource_dispatcher_host.h
index 00d19e0..46dd9c4 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host.h
+++ b/chrome/browser/renderer_host/resource_dispatcher_host.h
@@ -109,6 +109,7 @@ class ResourceDispatcherHost : public URLRequest::Delegate {
   void BeginDownload(const GURL& url,
                      const GURL& referrer,
                      const DownloadSaveInfo& save_info,
+                     bool prompt_for_save_location,
                      int process_unique_id,
                      int route_id,
                      URLRequestContext* request_context);
diff --git a/chrome/browser/renderer_host/resource_message_filter.cc b/chrome/browser/renderer_host/resource_message_filter.cc
index 0418487..698e385 100644
--- a/chrome/browser/renderer_host/resource_message_filter.cc
+++ b/chrome/browser/renderer_host/resource_message_filter.cc
@@ -871,9 +871,13 @@ void ResourceMessageFilter::OnDownloadUrl(const IPC::Message& message,
                                           const GURL& url,
                                           const GURL& referrer) {
   URLRequestContext* context = request_context_->GetURLRequestContext();
+
+  // Don't show "Save As" UI.
+  bool prompt_for_save_location = false;
   resource_dispatcher_host_->BeginDownload(url,
                                            referrer,
                                            DownloadSaveInfo(),
+                                           prompt_for_save_location,
                                            id(),
                                            message.routing_id(),
                                            context);