Merge lp:~abreu-alexandre/oxide/add-download-requested-support into lp:~oxide-developers/oxide/oxide.trunk

[Alexandre Abreu]

First part of the download support. For now it delegates all download requests to the embedder.

First part of the download support. For now it delegates all download requests to the embedder.

[lp:~abreu-alexandre/oxide/add-download-requested-support]

614. By Chris Coulson on 2014-06-17

GetViewBounds() only works when a RenderViewItem is added to a scene

615. By Chris Coulson on 2014-06-17

Actually make onWindowChanged a slot

616. By Chris Coulson on 2014-06-19

Bump Chromium rev to 37.0.2054.3

617. By Chris Coulson on 2014-06-20

Force Qt focus object changed events when the oxide focused node changes

618. By Alexandre Abreu on 2014-06-24

add devtools support

619. By Chris Coulson on 2014-06-24

Expose a Flickable-like API on the QML WebView, with content{Width,Height,X,Y} and viewport{Width,Height} attributes

620. By Chris Coulson on 2014-06-24

Stop using deprecated compositing paths by using a delegating renderer compositor alongside a synchronous browser compositor. Eventually we will delegate this to the Qml scenegraph compositor, although the extra browser compositor will still be useful for a fallback path (and for other ports of Oxide, should they happen)

621. By Chris Coulson on 2014-06-24

Evict the delegated frame and front buffer for hidden webviews

622. By Chris Coulson on 2014-06-24

Remove spurious printf

623. By Chris Coulson on 2014-06-24

Don't crash on shutdown when devtools isn't enabled

624. By Chris Coulson on 2014-06-24

Bump Chromium rev to 37.0.2062.0

[Chris Coulson (chrisccoulson)]

Ok, I've added some comments to this. It's fairly close already. One thing we do need though are some unit tests

review: Needs Fixing

[Alexandre Abreu (abreu-alexandre)]

Updated

[Alexandre Abreu (abreu-alexandre)]

Added some tests

[lp:~abreu-alexandre/oxide/add-download-requested-support]

625. By Alexandre Abreu on 2014-06-25

add download support

626. By Alexandre Abreu on 2014-06-26

update patch

[Michael Sheldon (michael-sheldon)]

The referrer currently appears to be missing the protocol (e.g. I get "mail.google.com/mail/mu/mp/30/" instead of "https://mail.google.com/mail/mu/mp/30/")

[lp:~abreu-alexandre/oxide/add-download-requested-support]

627. By Alexandre Abreu on 2014-06-26

add right reference to referrer

628. By Alexandre Abreu on 2014-06-26

send back the full url for the referrer

[Michael Sheldon (michael-sheldon)]

At the moment the request.cookies list appears to just contains one entry with all the semi-colon delimited cookies in it which I'm guessing wasn't the intent? I think this is due to splitting on "," instead of ";" (added in-line comment for this)

[lp:~abreu-alexandre/oxide/add-download-requested-support]

629. By Alexandre Abreu on 2014-06-27

make sure that multiple cookies are properly split

[Chris Coulson (chrisccoulson)]

Ok, that looks fine. Thanks!

review: Approve

=== added file 'patches/add-should-download-url-to-resource-dispatcher-host.patch'
--- patches/add-should-download-url-to-resource-dispatcher-host.patch	1970-01-01 00:00:00 +0000
+++ patches/add-should-download-url-to-resource-dispatcher-host.patch	2014-06-27 18:46:24 +0000
@@ -0,0 +1,125 @@
+# Description: Add a ShouldDownloadUrl embedder hook to dispatch download requests.
+# Author: Alexandre Abreu <[e-mail]>
+
+diff --git a/content/browser/loader/buffered_resource_handler.cc b/content/browser/loader/buffered_resource_handler.cc
+--- a/content/browser/loader/buffered_resource_handler.cc
++++ b/content/browser/loader/buffered_resource_handler.cc
+@@ -10,6 +10,7 @@
+ #include "base/logging.h"
+ #include "base/metrics/histogram.h"
+ #include "base/strings/string_util.h"
++#include "base/strings/utf_string_conversions.h"
+ #include "content/browser/download/download_resource_handler.h"
+ #include "content/browser/download/download_stats.h"
+ #include "content/browser/loader/certificate_resource_handler.h"
+@@ -341,6 +342,36 @@
+ #endif
+   }
+ 
++  if (host_->delegate()) {
++    std::string disposition;
++    request()->GetResponseHeaderByName(
++        "content-disposition", &disposition);
++    net::HttpContentDisposition
++        content_disposition(disposition, std::string());
++    ResourceRequestInfoImpl* info = GetRequestInfo();
++    if (!host_->delegate()->ShouldDownloadUrl(
++            request()->url(),
++            request()->first_party_for_cookies(),
++	    info->HasUserGesture(),
++	    !disposition.empty() &&
++  	      (content_disposition.parse_result_flags() & net::HttpContentDisposition::HAS_FILENAME)
++  	        ? base::UTF8ToUTF16(content_disposition.filename())
++ 	        : base::string16(),
++	    false,
++	    Referrer(GURL(request()->referrer()), info->GetReferrerPolicy()),
++	    response_->head.mime_type,
++	    info->GetChildID(),
++	    info->GetRouteID(),
++	    info->GetContext())) {
++      request()->Cancel();
++      Cancel();
++      LOG(INFO) << "Download request for "
++		<< request()->url().GetContent()
++		<< " got cancelled by embedder";
++      return false;
++    }
++  }
++
+   // Install download handler
+   info->set_is_download(true);
+   scoped_ptr<ResourceHandler> handler(
+diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
+--- a/content/browser/loader/resource_dispatcher_host_impl.cc
++++ b/content/browser/loader/resource_dispatcher_host_impl.cc
+@@ -493,6 +493,23 @@
+                              DOWNLOAD_INTERRUPT_REASON_USER_SHUTDOWN);
+ 
+   const GURL& url = request->original_url();
++  if (delegate_) {
++    bool should_download_url = delegate_->ShouldDownloadUrl(
++      url,
++      request->first_party_for_cookies(),
++      is_content_initiated,
++      save_info->suggested_name,
++      save_info->prompt_for_save_location,
++      referrer,
++      std::string(), // mime_type
++      child_id,
++      route_id,
++      context);
++    if (!should_download_url) {
++      return CallbackAndReturn(started_callback,
++			       DOWNLOAD_INTERRUPT_REASON_USER_SHUTDOWN);
++    }
++  }
+ 
+   // http://crbug.com/90971
+   char url_buf[128];
+diff --git a/content/public/browser/resource_dispatcher_host_delegate.cc b/content/public/browser/resource_dispatcher_host_delegate.cc
+--- a/content/public/browser/resource_dispatcher_host_delegate.cc
++++ b/content/public/browser/resource_dispatcher_host_delegate.cc
+@@ -96,6 +96,20 @@
+     net::URLRequest* url_request) {
+ }
+ 
++bool ResourceDispatcherHostDelegate::ShouldDownloadUrl(
++    const GURL& url,
++    const GURL& first_party_url,
++    bool is_content_initiated,
++    const base::string16& suggested_name,
++    const bool use_prompt,
++    const Referrer& referrer,
++    const std::string& mime_type,
++    int render_process_id,
++    int render_view_id,
++    ResourceContext* resource_context) {
++  return true;
++}
++
+ ResourceDispatcherHostDelegate::ResourceDispatcherHostDelegate() {
+ }
+ 
+diff --git a/content/public/browser/resource_dispatcher_host_delegate.h b/content/public/browser/resource_dispatcher_host_delegate.h
+--- a/content/public/browser/resource_dispatcher_host_delegate.h
++++ b/content/public/browser/resource_dispatcher_host_delegate.h
+@@ -140,6 +141,19 @@
+   // Notification that a request has completed.
+   virtual void RequestComplete(net::URLRequest* url_request);
+ 
++  // Returns whether a given download request should be carried on.
++  virtual bool ShouldDownloadUrl(
++      const GURL& url,
++      const GURL& first_party_url,
++      bool is_content_initiated,
++      const base::string16& suggested_name,
++      const bool use_prompt,
++      const Referrer& referrer,
++      const std::string& mime_type,
++      int render_process_id,
++      int render_view_id,
++      ResourceContext* resource_context);
++
+  protected:
+   ResourceDispatcherHostDelegate();
+   virtual ~ResourceDispatcherHostDelegate();

=== modified file 'patches/series'
--- patches/series	2014-06-06 16:07:21 +0000
+++ patches/series	2014-06-27 18:46:24 +0000
@@ -14,3 +14,4 @@
 expose-extra-properties-for-should-create-webcontents.patch
 disable-default-network-location-provider.patch
 use-gles-api.patch
+add-should-download-url-to-resource-dispatcher-host.patch

=== added file 'qt/core/api/oxideqdownloadrequest.cc'
--- qt/core/api/oxideqdownloadrequest.cc	1970-01-01 00:00:00 +0000
+++ qt/core/api/oxideqdownloadrequest.cc	2014-06-27 18:46:24 +0000
@@ -0,0 +1,98 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2014 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#include "oxideqdownloadrequest.h"
+#include "oxideqdownloadrequest_p.h"
+
+#include "net/http/http_request_headers.h"
+#include "url/gurl.h"
+
+namespace {
+const QString kCookieListDelimiter = ";";
+}
+
+OxideQDownloadRequestPrivate::OxideQDownloadRequestPrivate(
+    const QUrl& url,
+    const QString& mimeType,
+    const bool shouldPrompt,
+    const QString& suggestedFilename,
+    const QStringList& cookies,
+    const QString& referrer)
+  : url_(url),
+    mime_type_(mimeType),
+    should_prompt_(shouldPrompt),
+    suggested_filename_(suggestedFilename),
+    cookies_(cookies),
+    referrer_(referrer) {}
+
+OxideQDownloadRequestPrivate::~OxideQDownloadRequestPrivate() {}
+
+OxideQDownloadRequest::OxideQDownloadRequest(
+    const QUrl& url,
+    const QString& mimeType,
+    const bool shouldPrompt,
+    const QString& suggestedFilename,
+    const QString& cookies,
+    const QString& referrer,
+    QObject* parent) :
+      QObject(parent),
+      d_ptr(new OxideQDownloadRequestPrivate(url,
+					     mimeType,
+					     shouldPrompt,
+					     suggestedFilename,
+					     cookies.split(kCookieListDelimiter, QString::SkipEmptyParts),
+					     referrer)) {
+}
+
+OxideQDownloadRequest::~OxideQDownloadRequest() {}
+
+QUrl OxideQDownloadRequest::url() const {
+  Q_D(const OxideQDownloadRequest);
+
+  return d->url_;
+}
+
+QString OxideQDownloadRequest::mimeType() const {
+  Q_D(const OxideQDownloadRequest);
+
+  return d->mime_type_;
+}
+
+bool OxideQDownloadRequest::shouldPrompt() const {
+  Q_D(const OxideQDownloadRequest);
+
+  return d->should_prompt_;
+}
+
+QString OxideQDownloadRequest::suggestedFilename() const {
+  Q_D(const OxideQDownloadRequest);
+
+  return d->suggested_filename_;
+}
+
+QStringList OxideQDownloadRequest::cookies() const {
+  Q_D(const OxideQDownloadRequest);
+
+  return d->cookies_;
+}
+
+QString OxideQDownloadRequest::referrer() const {
+  Q_D(const OxideQDownloadRequest);
+
+  return d->referrer_;
+}
+

=== added file 'qt/core/api/oxideqdownloadrequest.h'
--- qt/core/api/oxideqdownloadrequest.h	1970-01-01 00:00:00 +0000
+++ qt/core/api/oxideqdownloadrequest.h	2014-06-27 18:46:24 +0000
@@ -0,0 +1,66 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2014 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifndef OXIDE_Q_DOWNLOAD_REQUEST
+#define OXIDE_Q_DOWNLOAD_REQUEST
+
+#include <QObject>
+#include <QScopedPointer>
+#include <QString>
+#include <QStringList>
+#include <QtGlobal>
+#include <QUrl>
+
+class OxideQDownloadRequestPrivate;
+
+class Q_DECL_EXPORT OxideQDownloadRequest : public QObject {
+  Q_OBJECT
+
+  Q_PROPERTY(QUrl url READ url CONSTANT)
+  Q_PROPERTY(QString mimeType READ mimeType CONSTANT)
+  Q_PROPERTY(bool shouldPrompt READ shouldPrompt CONSTANT)
+  Q_PROPERTY(QString suggestedFilename READ suggestedFilename CONSTANT)
+  Q_PROPERTY(QStringList cookies READ cookies CONSTANT)
+  Q_PROPERTY(QString referrer READ referrer CONSTANT)
+
+  Q_DECLARE_PRIVATE(OxideQDownloadRequest)
+  Q_DISABLE_COPY(OxideQDownloadRequest)
+
+ public:
+  OxideQDownloadRequest(
+      const QUrl& url,
+      const QString& mimeType,
+      const bool shouldPrompt,
+      const QString& suggestedFilename,
+      const QString& cookies,
+      const QString& referrer,
+      QObject* parent = 0);
+  virtual ~OxideQDownloadRequest();
+
+  QUrl url() const;
+  QString mimeType() const;
+  bool shouldPrompt() const;
+  QString suggestedFilename() const;
+  QStringList cookies() const;
+  QString referrer() const;
+
+ private:
+
+  QScopedPointer<OxideQDownloadRequestPrivate> d_ptr;
+};
+
+#endif // OXIDE_Q_DOWNLOAD_REQUEST

=== added file 'qt/core/api/oxideqdownloadrequest_p.h'
--- qt/core/api/oxideqdownloadrequest_p.h	1970-01-01 00:00:00 +0000
+++ qt/core/api/oxideqdownloadrequest_p.h	2014-06-27 18:46:24 +0000
@@ -0,0 +1,51 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2014 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifndef _OXIDE_QT_CORE_API_DOWNLOAD_REQUEST_P_H_
+#define _OXIDE_QT_CORE_API_DOWNLOAD_REQUEST_P_H_
+
+#include <QtGlobal>
+#include <QString>
+#include <QStringList>
+#include <QUrl>
+
+class OxideQDownloadRequest;
+
+class OxideQDownloadRequestPrivate {
+ public:
+  OxideQDownloadRequestPrivate(
+      const QUrl& url,
+      const QString& mimeType,
+      const bool shouldPrompt,
+      const QString& suggestedFilename,
+      const QStringList& cookies,
+      const QString& referrer);
+  virtual ~OxideQDownloadRequestPrivate();
+
+ private:
+  friend class OxideQDownloadRequest;
+
+  QUrl url_;
+  QString mime_type_;
+  bool should_prompt_;
+  QString suggested_filename_;
+  QStringList cookies_;
+  QString referrer_;
+};
+
+#endif // _OXIDE_QT_CORE_API_DOWNLOAD_REQUEST_P_H_
+

=== modified file 'qt/core/browser/oxide_qt_web_view.cc'
--- qt/core/browser/oxide_qt_web_view.cc	2014-06-23 15:10:54 +0000
+++ qt/core/browser/oxide_qt_web_view.cc	2014-06-27 18:46:24 +0000
@@ -29,6 +29,7 @@
 #include "net/base/net_errors.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 
+#include "qt/core/api/oxideqdownloadrequest.h"
 #include "qt/core/api/oxideqloadevent.h"
 #include "qt/core/api/oxideqnavigationrequest.h"
 #include "qt/core/api/oxideqnewviewrequest.h"
@@ -389,6 +390,25 @@
   return view;
 }
 
+void WebView::OnDownloadRequested(const GURL& url,
+				  const std::string& mimeType,
+				  const bool shouldPrompt,
+				  const base::string16& suggestedFilename,
+				  const std::string& cookies,
+				  const std::string& referrer) {
+  OxideQDownloadRequest
+    downloadRequest(
+        QUrl(QString::fromStdString(url.spec())),
+        QString::fromStdString(mimeType),
+        shouldPrompt,
+        QString::fromStdString(base::UTF16ToUTF8(suggestedFilename)),
+        QString::fromStdString(cookies),
+        QString::fromStdString(referrer));
+
+  adapter_->DownloadRequested(&downloadRequest);
+}
+
+
 // static
 WebView* WebView::Create(WebViewAdapter* adapter) {
   return new WebView(adapter);

=== modified file 'qt/core/browser/oxide_qt_web_view.h'
--- qt/core/browser/oxide_qt_web_view.h	2014-06-23 15:10:54 +0000
+++ qt/core/browser/oxide_qt_web_view.h	2014-06-27 18:46:24 +0000
@@ -113,6 +113,13 @@
                               WindowOpenDisposition disposition,
                               bool user_gesture) FINAL;
 
+  void OnDownloadRequested(const GURL& url,
+			   const std::string& mimeType,
+			   const bool shouldPrompt,
+			   const base::string16& suggestedFilename,
+			   const std::string& cookies,
+			   const std::string& referrer) FINAL;
+
   oxide::WebFrame* CreateWebFrame(content::FrameTreeNode* node) FINAL;
 
   oxide::WebView* CreateNewWebView(const gfx::Rect& initial_pos,

=== modified file 'qt/core/core.gyp'
--- qt/core/core.gyp	2014-06-24 19:21:21 +0000
+++ qt/core/core.gyp	2014-06-27 18:46:24 +0000
@@ -128,6 +128,7 @@
         '<(DEPTH)'
       ],
       'sources': [
+        '<(INTERMEDIATE_DIR)/moc_oxideqdownloadrequest.cc',
         '<(INTERMEDIATE_DIR)/moc_oxideqloadevent.cc',
         '<(INTERMEDIATE_DIR)/moc_oxideqnetworkcallbackevents.cc',
         '<(INTERMEDIATE_DIR)/moc_oxideqnavigationrequest.cc',
@@ -135,6 +136,9 @@
         '<(INTERMEDIATE_DIR)/moc_oxideqpermissionrequest.cc',
         '<(INTERMEDIATE_DIR)/moc_oxideqstoragepermissionrequest.cc',
         '<(INTERMEDIATE_DIR)/moc_oxideqwebpreferences.cc',
+        'api/oxideqdownloadrequest.cc',
+        'api/oxideqdownloadrequest.h',
+        'api/oxideqdownloadrequest_p.h',
         'api/oxideqloadevent.cc',
         'api/oxideqloadevent.h',
         'api/oxideqloadevent_p.h',
@@ -187,6 +191,11 @@
       ],
       'actions': [
         {
+          'action_name': 'moc_oxideqdownloadrequest.cc',
+          'moc_input': 'api/oxideqdownloadrequest.h',
+          'includes': [ 'moc.gypi' ]
+        },
+        {
           'action_name': 'moc_oxideqloadevent.cc',
           'moc_input': 'api/oxideqloadevent.h',
           'includes': [ 'moc.gypi' ]

=== modified file 'qt/core/glue/oxide_qt_web_view_adapter.h'
--- qt/core/glue/oxide_qt_web_view_adapter.h	2014-06-24 14:54:27 +0000
+++ qt/core/glue/oxide_qt_web_view_adapter.h	2014-06-27 18:46:24 +0000
@@ -36,6 +36,7 @@
 class QSize;
 QT_END_NAMESPACE
 
+class OxideQDownloadRequest;
 class OxideQGeolocationPermissionRequest;
 class OxideQLoadEvent;
 class OxideQNavigationRequest;
@@ -191,6 +192,8 @@
 
   virtual void HandleKeyboardEvent(QKeyEvent* event) = 0;
 
+  virtual void DownloadRequested(OxideQDownloadRequest* downloadRequest) = 0;
+
   QScopedPointer<WebView> priv;
   QList<ScriptMessageHandlerAdapter *> message_handlers_;
   QScopedPointer<ConstructProperties> construct_props_;

=== modified file 'qt/quick/api/oxideqquickwebview.cc'
--- qt/quick/api/oxideqquickwebview.cc	2014-06-23 15:10:54 +0000
+++ qt/quick/api/oxideqquickwebview.cc	2014-06-27 18:46:24 +0000
@@ -344,6 +344,13 @@
   w->sendEvent(q, event);
 }
 
+void OxideQQuickWebViewPrivate::DownloadRequested(
+    OxideQDownloadRequest* downloadRequest) {
+  Q_Q(OxideQQuickWebView);
+
+  emit q->downloadRequested(downloadRequest);
+}
+
 void OxideQQuickWebViewPrivate::completeConstruction() {
   Q_Q(OxideQQuickWebView);
 

=== modified file 'qt/quick/api/oxideqquickwebview_p.h'
--- qt/quick/api/oxideqquickwebview_p.h	2014-06-20 17:07:39 +0000
+++ qt/quick/api/oxideqquickwebview_p.h	2014-06-27 18:46:24 +0000
@@ -43,6 +43,7 @@
 class OxideQQuickWebFrame;
 class OxideQQuickWebView;
 class OxideQQuickWebViewPrivate;
+class OxideQDownloadRequest;
 
 class OxideQQuickWebViewAttached : public QObject {
   Q_OBJECT
@@ -223,6 +224,7 @@
                                 const QString& message,
                                 int lineNumber,
                                 const QString& sourceId);
+  void downloadRequested(OxideQDownloadRequest* request);
 
  private:
   Q_PRIVATE_SLOT(d_func(), void contextConstructed());

=== modified file 'qt/quick/api/oxideqquickwebview_p_p.h'
--- qt/quick/api/oxideqquickwebview_p_p.h	2014-06-23 15:10:54 +0000
+++ qt/quick/api/oxideqquickwebview_p_p.h	2014-06-27 18:46:24 +0000
@@ -107,6 +107,8 @@
 
   void HandleKeyboardEvent(QKeyEvent *event) Q_DECL_FINAL;
 
+  void DownloadRequested(OxideQDownloadRequest* downloadRequest) Q_DECL_FINAL;
+
   void completeConstruction();
 
   static void messageHandler_append(

=== modified file 'qt/quick/oxide_qml_plugin.cc'
--- qt/quick/oxide_qml_plugin.cc	2014-05-07 14:06:05 +0000
+++ qt/quick/oxide_qml_plugin.cc	2014-06-27 18:46:24 +0000
@@ -21,6 +21,7 @@
 #include <QQmlEngine>
 #include <QQmlExtensionPlugin>
 
+#include "qt/core/api/oxideqdownloadrequest.h"
 #include "qt/core/api/oxideqloadevent.h"
 #include "qt/core/api/oxideqnavigationrequest.h"
 #include "qt/core/api/oxideqnewviewrequest.h"
@@ -78,6 +79,8 @@
         "OutgoingMessageRequests are created automatically by WebFrame.sendMessage");
     qmlRegisterUncreatableType<OxideQQuickWebFrame>(uri, 1, 0, "WebFrame",
         "Frames are created automatically by Oxide to represent frames in the renderer");
+    qmlRegisterUncreatableType<OxideQDownloadRequest>(uri, 1, 0, "DownloadRequest",
+        "Cannot create separate instance of DownloadRequest");
 
     qmlRegisterType<OxideQQuickScriptMessageHandler>(uri, 1, 0, "ScriptMessageHandler");
     qmlRegisterType<OxideQQuickUserScript>(uri, 1, 0, "UserScript");

=== added file 'qt/tests/qmltests/api/tst_WebView_downloadRequested.py'
--- qt/tests/qmltests/api/tst_WebView_downloadRequested.py	1970-01-01 00:00:00 +0000
+++ qt/tests/qmltests/api/tst_WebView_downloadRequested.py	2014-06-27 18:46:24 +0000
@@ -0,0 +1,20 @@
+from cStringIO import StringIO
+from datetime import datetime, timedelta
+
+def handler(request):
+  html = StringIO()
+  html.write("<html></html>");
+
+  expires = datetime.utcnow()
+  expires += timedelta(hours=100)
+
+  request.send_response(200)
+  request.send_header("Content-Type", "text/html")
+  request.send_header("Content-Length", html.tell())
+  request.send_header("Cache-Control", "private")
+  request.send_header("Content-Disposition", "attachment; filename=001.html")
+  request.send_header("Set-Cookie", "foo=bar;Expires=%s;Domain=;Path=/" % expires.strftime("%a, %d-%b-%Y %H-%M-%S UTC"))
+  request.send_header("Set-Cookie", "bar=bazz")
+  request.end_headers()
+
+  request.wfile.write(html.getvalue())

=== added file 'qt/tests/qmltests/api/tst_WebView_downloadRequested.qml'
--- qt/tests/qmltests/api/tst_WebView_downloadRequested.qml	1970-01-01 00:00:00 +0000
+++ qt/tests/qmltests/api/tst_WebView_downloadRequested.qml	2014-06-27 18:46:24 +0000
@@ -0,0 +1,58 @@
+import QtQuick 2.0
+import QtTest 1.0
+import com.canonical.Oxide 1.0
+import com.canonical.Oxide.Testing 1.0
+
+TestWebView {
+  id: webView
+  focus: true
+  width: 200
+  height: 200
+
+  property string latestDownloadUrl: ""
+  property string latestSuggestedFilename: ""
+  property var latestCookies
+  property string latestMimeType: ""
+  property string latestReferrer: ""
+
+  onDownloadRequested: {
+    latestDownloadUrl = request.url;
+    latestCookies = [].slice.call(request.cookies).join(",");
+    latestMimeType = request.mimeType;
+    latestSuggestedFilename = request.suggestedFilename;
+    latestReferrer = request.referrer;
+  }
+
+  SignalSpy {
+    id: spy
+    target: webView
+    signalName: "downloadRequested"
+  }
+
+  TestCase {
+    name: "WebView_downloadRequest"
+    when: windowShown
+
+    function test_WebView_downloadRequestWithContentDisposition() {
+      webView.url = "http://localhost:8080/tst_WebView_downloadRequested.py"
+      verify(webView.waitForLoadStopped(),
+             "Timed out waiting for a successful load");
+
+      compare(spy.count, 1)
+      compare(webView.latestMimeType, "text/html")
+      compare(webView.latestCookies, "foo=bar, bar=bazz")
+      compare(webView.latestSuggestedFilename, "001.html")
+    }
+
+    function test_WebView_downloadRequestUnhandledMimeType() {
+      webView.url = "http://localhost:8080/tst_WebView_downloadRequestedUnhandledMimeType.py"
+      verify(webView.waitForLoadStopped(),
+             "Timed out waiting for a successful load");
+
+      compare(spy.count, 1)
+      compare(webView.latestMimeType, "application/pdf")
+      compare(webView.latestCookies, "foo=bar")
+      compare(webView.latestSuggestedFilename, "")
+    }
+  }
+}

=== added file 'qt/tests/qmltests/api/tst_WebView_downloadRequestedUnhandledMimeType.py'
--- qt/tests/qmltests/api/tst_WebView_downloadRequestedUnhandledMimeType.py	1970-01-01 00:00:00 +0000
+++ qt/tests/qmltests/api/tst_WebView_downloadRequestedUnhandledMimeType.py	2014-06-27 18:46:24 +0000
@@ -0,0 +1,18 @@
+from cStringIO import StringIO
+from datetime import datetime, timedelta
+
+def handler(request):
+  html = StringIO()
+  html.write("<html></html>");
+
+  expires = datetime.utcnow()
+  expires += timedelta(hours=100)
+
+  request.send_response(200)
+  request.send_header("Content-Type", "application/pdf")
+  request.send_header("Content-Length", html.tell())
+  request.send_header("Cache-Control", "private")
+  request.send_header("Set-Cookie", "foo=bar;Expires=%s;Domain=;Path=/" % expires.strftime("%a, %d-%b-%Y %H-%M-%S UTC"))
+  request.end_headers()
+
+  request.wfile.write(html.getvalue())

=== modified file 'shared/browser/oxide_content_browser_client.cc'
--- shared/browser/oxide_content_browser_client.cc	2014-06-24 19:21:21 +0000
+++ shared/browser/oxide_content_browser_client.cc	2014-06-27 18:46:24 +0000
@@ -30,6 +30,7 @@
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/public/browser/browser_main_parts.h"
 #include "content/public/browser/render_process_host.h"
+#include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/common/content_switches.h"
 #include "net/base/net_module.h"
 #include "third_party/WebKit/public/platform/WebScreenInfo.h"
@@ -55,6 +56,7 @@
 #include "oxide_form_factor.h"
 #include "oxide_io_thread.h"
 #include "oxide_message_pump.h"
+#include "oxide_resource_dispatcher_host_delegate.h"
 #include "oxide_script_message_dispatcher_browser.h"
 #include "oxide_user_agent_override_provider.h"
 #include "oxide_web_preferences.h"
@@ -410,6 +412,12 @@
   return false;
 }
 
+void ContentBrowserClient::ResourceDispatcherHostCreated() {
+  resource_dispatcher_host_delegate_.reset(new ResourceDispatcherHostDelegate());
+  content::ResourceDispatcherHost::Get()->SetDelegate(
+      resource_dispatcher_host_delegate_.get());
+}
+
 ContentBrowserClient::ContentBrowserClient() {}
 
 ContentBrowserClient::~ContentBrowserClient() {}

=== modified file 'shared/browser/oxide_content_browser_client.h'
--- shared/browser/oxide_content_browser_client.h	2014-06-19 17:41:21 +0000
+++ shared/browser/oxide_content_browser_client.h	2014-06-27 18:46:24 +0000
@@ -23,7 +23,15 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
-#include "content/public/browser/content_browser_client.h"
+#include "base/memory/scoped_ptr.h"
+#include "content/public/browser/content_browser_client.h"
+
+#include "base/observer_list.h"
+#include "base/synchronization/lock.h"
+#include "content/public/browser/browser_context.h"
+#include "content/public/browser/content_browser_client.h"
+#include "content/public/browser/cookie_store_factory.h"
+#include "net/base/static_cookie_policy.h"
 
 namespace base {
 class MessagePump;
@@ -31,6 +39,7 @@
 
 namespace content {
 class RenderViewHost;
+class ResourceDispatcherHostDelegate;
 }
 
 namespace gfx {
@@ -40,6 +49,7 @@
 namespace oxide {
 
 class GLShareGroup;
+class ResourceDispatcherHostDelegate;
 class SharedGLContext;
 class WebFrameTree;
 class WebPreferences;
@@ -136,6 +146,10 @@
   // Should be subclassed
   virtual bool IsTouchSupported();
 
+  virtual void ResourceDispatcherHostCreated() FINAL;
+
+  scoped_ptr<oxide::ResourceDispatcherHostDelegate> resource_dispatcher_host_delegate_;
+
   DISALLOW_COPY_AND_ASSIGN(ContentBrowserClient);
 };
 

=== added file 'shared/browser/oxide_resource_dispatcher_host_delegate.cc'
--- shared/browser/oxide_resource_dispatcher_host_delegate.cc	1970-01-01 00:00:00 +0000
+++ shared/browser/oxide_resource_dispatcher_host_delegate.cc	2014-06-27 18:46:24 +0000
@@ -0,0 +1,162 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2014 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#include "oxide_resource_dispatcher_host_delegate.h"
+
+#include "base/bind.h"
+#include "base/callback.h"
+#include "base/logging.h"
+#include "base/memory/ref_counted.h"
+#include "content/browser/frame_host/render_frame_host_impl.h"
+#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/render_process_host.h"
+#include "content/public/browser/render_view_host.h"
+#include "content/public/browser/resource_context.h"
+#include "content/public/common/referrer.h"
+#include "ipc/ipc_message.h"
+#include "ipc/ipc_message_macros.h"
+#include "net/cookies/cookie_monster.h"
+#include "net/url_request/url_request_context.h"
+#include "url/gurl.h"
+
+#include "shared/common/oxide_messages.h"
+#include "shared/common/oxide_script_message_handler.h"
+#include "shared/common/oxide_script_message_request.h"
+
+#include "oxide_script_message_impl_browser.h"
+#include "oxide_script_message_request_impl_browser.h"
+#include "oxide_script_message_target.h"
+#include "oxide_web_frame.h"
+#include "oxide_web_view.h"
+
+namespace oxide {
+
+bool ResourceDispatcherHostDelegate::ShouldDownloadUrl(const GURL& url,
+      const GURL& first_party_url,
+      bool is_content_initiated,
+      const base::string16& suggested_name,
+      const bool use_prompt,
+      const content::Referrer& referrer,
+      const std::string& mime_type,
+      int render_process_id,
+      int render_view_id,
+      content::ResourceContext* resource_context) {
+
+  DispatchDownloadRequest(
+      url,
+      first_party_url,
+      is_content_initiated,
+      suggested_name,
+      use_prompt,
+      referrer,
+      mime_type,
+      render_process_id,
+      render_view_id,
+      resource_context);
+
+  return false;
+}
+
+void ResourceDispatcherHostDelegate::DispatchDownloadRequest(
+    const GURL& url,
+    const GURL& first_party_url,
+    bool is_content_initiated,
+    const base::string16& suggested_name,
+    const bool use_prompt,
+    const content::Referrer& referrer,
+    const std::string& mime_type,
+    int render_process_id,
+    int render_view_id,
+    content::ResourceContext* resource_context) {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
+
+  DownloadRequestParams params;
+  params.url = url;
+  params.is_content_initiated = is_content_initiated;
+  params.suggested_name = suggested_name;
+  params.use_prompt = use_prompt;
+  params.referrer = referrer.url;
+  params.mime_type = mime_type;
+  params.render_process_id = render_process_id;
+  params.render_view_id = render_view_id;
+
+  BrowserContextIOData* io_data =
+      BrowserContextIOData::FromResourceContext(resource_context);
+
+  if (io_data && io_data->CanAccessCookies(url, first_party_url, false)) {
+    net::CookieStore* cookie_store =
+      GetCookieStoreForContext(resource_context);
+
+    if (cookie_store) {
+      net::CookieOptions cookie_options;
+      cookie_options.set_include_httponly();
+
+      cookie_store->GetCookiesWithOptionsAsync(
+          url, cookie_options,
+	  base::Bind(&ResourceDispatcherHostDelegate::DispatchDownloadRequestWithCookies,
+	  	     params));
+      return;
+    }
+  }
+
+  // Fallback with default with empty cookies
+  DispatchDownloadRequestWithCookies(params, std::string());
+}
+
+void ResourceDispatcherHostDelegate::DispatchDownloadRequestWithCookies(
+    const DownloadRequestParams & params,
+    const std::string& cookies) {
+  if (!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) {
+    content::BrowserThread::PostTask(
+        content::BrowserThread::UI,
+        FROM_HERE,
+        base::Bind(&ResourceDispatcherHostDelegate::DispatchDownloadRequestWithCookies,
+                   params, cookies));
+    return;
+  }
+  content::RenderViewHost* rvh =
+      content::RenderViewHost::FromID(
+          params.render_process_id, params.render_view_id);
+  if (!rvh) {
+    LOG(ERROR) << "Invalid or non-existent render_process_id & render_view_id:"
+	       << params.render_process_id << ", " << params.render_view_id
+	       << "during download url delegate dispatch";
+    return;
+  }
+
+  WebView* webview = WebView::FromRenderViewHost(rvh);
+  if (!webview) {
+    return;
+  }
+  webview->DownloadRequested(
+    params.url,
+    params.mime_type,
+    params.use_prompt,
+    params.suggested_name,
+    cookies,
+    params.referrer.spec());
+}
+
+net::CookieStore* ResourceDispatcherHostDelegate::GetCookieStoreForContext(
+    content::ResourceContext* resource_context) {
+  return resource_context && resource_context->GetRequestContext()
+      ? resource_context->GetRequestContext()->cookie_store()
+      : NULL;
+}
+
+} // namespace oxide

=== added file 'shared/browser/oxide_resource_dispatcher_host_delegate.h'
--- shared/browser/oxide_resource_dispatcher_host_delegate.h	1970-01-01 00:00:00 +0000
+++ shared/browser/oxide_resource_dispatcher_host_delegate.h	2014-06-27 18:46:24 +0000
@@ -0,0 +1,92 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2014 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifndef _OXIDE_SHARED_BROWSER_RESOURCE_DISPATCHER_HOST_DELEGATE_H_
+#define _OXIDE_SHARED_BROWSER_RESOURCE_DISPATCHER_HOST_DELEGATE_H_
+
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
+#include "base/memory/ref_counted.h"
+#include "content/public/browser/content_browser_client.h"
+#include "content/public/browser/resource_dispatcher_host_delegate.h"
+
+namespace content {
+class ResourceContext;
+struct Referrer;
+}
+
+namespace net {
+class URLRequest;
+class CookieStore;
+}
+
+namespace oxide {
+
+class ResourceDispatcherHostDelegate :
+    public content::ResourceDispatcherHostDelegate {
+ public:
+   ~ResourceDispatcherHostDelegate() {}
+
+  virtual bool ShouldDownloadUrl(
+      const GURL& url,
+      const GURL& first_party_url,
+      bool is_content_initiated,
+      const base::string16& suggested_name,
+      const bool use_prompt,
+      const content::Referrer& referrer,
+      const std::string& mime_type,
+      int render_process_id,
+      int render_view_id,
+      content::ResourceContext* resource_context) FINAL;
+
+ private:
+
+  struct DownloadRequestParams {
+    GURL url;
+    bool is_content_initiated;
+    base::string16 suggested_name;
+    bool use_prompt;
+    GURL referrer;
+    std::string mime_type;
+    int render_process_id;
+    int render_view_id;
+  };
+
+  void DispatchDownloadRequest(
+      const GURL& url,
+      const GURL& first_party_url,
+      bool is_content_initiated,
+      const base::string16& suggested_name,
+      const bool use_prompt,
+      const content::Referrer& referrer,
+      const std::string& mime_type,
+      int render_process_id,
+      int render_view_id,
+      content::ResourceContext* resource_context);
+
+  static void DispatchDownloadRequestWithCookies(
+      const DownloadRequestParams & params,
+      const std::string& cookies);
+
+  net::CookieStore* GetCookieStoreForContext(
+      content::ResourceContext* resource_context);
+};
+
+} // namespace oxide
+
+#endif // OXIDE_SHARED_BROWSER_RESOURCE_DISPATCHER_HOST_DELEGATE
+

=== modified file 'shared/browser/oxide_web_view.cc'
--- shared/browser/oxide_web_view.cc	2014-06-24 14:54:27 +0000
+++ shared/browser/oxide_web_view.cc	2014-06-27 18:46:24 +0000
@@ -577,6 +577,13 @@
   return NULL;
 }
 
+void WebView::OnDownloadRequested(const GURL& url,
+				  const std::string& mimeType,
+				  const bool shouldPrompt,
+				  const base::string16& suggestedFilename,
+				  const std::string& cookies,
+				  const std::string& referrer) {}
+
 WebView::WebView()
     : web_contents_helper_(NULL),
       initial_preferences_(NULL),
@@ -1059,4 +1066,15 @@
   }
 }
 
+void WebView::DownloadRequested(
+    const GURL& url,
+    const std::string& mimeType,
+    const bool shouldPrompt,
+    const base::string16& suggestedFilename,
+    const std::string& cookies,
+    const std::string& referrer) {
+  OnDownloadRequested(url, mimeType, shouldPrompt,
+      suggestedFilename, cookies, referrer);
+}
+
 } // namespace oxide

=== modified file 'shared/browser/oxide_web_view.h'
--- shared/browser/oxide_web_view.h	2014-06-24 14:54:27 +0000
+++ shared/browser/oxide_web_view.h	2014-06-27 18:46:24 +0000
@@ -177,6 +177,14 @@
   void GotNewCompositorFrameMetadata(
       const cc::CompositorFrameMetadata& metadata);
 
+  void DownloadRequested(
+      const GURL& url,
+      const std::string& mimeType,
+      const bool shouldPrompt,
+      const base::string16& suggestedFilename,
+      const std::string& cookies,
+      const std::string& referrer) FINAL;
+
  protected:
   WebView();
 
@@ -334,6 +342,14 @@
   virtual WebView* CreateNewWebView(const gfx::Rect& initial_pos,
                                     WindowOpenDisposition disposition);
 
+  virtual void OnDownloadRequested(
+      const GURL& url,
+      const std::string& mimeType,
+      const bool shouldPrompt,
+      const base::string16& suggestedFilename,
+      const std::string& cookies,
+      const std::string& referrer);
+
   scoped_ptr<content::WebContentsImpl> web_contents_;
   WebViewContentsHelper* web_contents_helper_;
 

=== modified file 'shared/shared.gyp'
--- shared/shared.gyp	2014-06-24 15:13:15 +0000
+++ shared/shared.gyp	2014-06-27 18:46:24 +0000
@@ -276,6 +276,8 @@
         'browser/oxide_render_widget_host_view.h',
         'browser/oxide_render_widget_host_view_factory.cc',
         'browser/oxide_render_widget_host_view_factory.h',
+        'browser/oxide_resource_dispatcher_host_delegate.cc',
+        'browser/oxide_resource_dispatcher_host_delegate.h',
         'browser/oxide_script_message_dispatcher_browser.cc',
         'browser/oxide_script_message_dispatcher_browser.h',
         'browser/oxide_script_message_impl_browser.cc',