Merge lp:~osomon/oxide/context-menu into lp:~oxide-developers/oxide/oxide.trunk

[Olivier Tilloy]

Support for context menus.

[lp:~osomon/oxide/context-menu]

1036. By Olivier Tilloy on 2015-05-15

Merge the latest changes from trunk and resolve a conflict.

[Chris Coulson (chrisccoulson)]

Thanks for working on this - I've added a few comments inline.

In addition to that, there's a few use cases that are missing:
- Open link / image / audio / video in new tab / window don't have any way to pass referrer information when appropriate. I'm not sure how best to handle that.
- Copy image to clipboard (for image + canvas)
- Controlling the media element (play / pause / mute)
- Save page (there should be a WebView API for this)
- Reload frame (there should be a WebView API for this).

It's ok to leave these cases unimplemented for this iteration, but we should have follow up bugs for them.

Out of interest - for the browser implementation, have you had a look at the logic in Chromium (particularly components/renderer_context_menu/context_menu_content_type.cc and chrome/browser/renderer_context_menu/render_view_context_menu.cc)?

review: Needs Fixing

[lp:~osomon/oxide/context-menu]

1037. By Olivier Tilloy on 2015-05-22

Merge the latest changes from trunk and resolve a couple of conflicts.

1038. By Olivier Tilloy on 2015-05-22

Use DISALLOW_COPY_AND_ASSIGN instead of DISALLOW_IMPLICIT_CONSTRUCTORS.

1039. By Olivier Tilloy on 2015-05-22

QPoint → QPointF

1040. By Olivier Tilloy on 2015-05-22

Remove unused frameCharset property.

1041. By Olivier Tilloy on 2015-05-22

Remove unused suggestedFilename property.

1042. By Olivier Tilloy on 2015-05-22

Convert can* properties to edit flags.

1043. By Olivier Tilloy on 2015-05-22

Add mediaType property.

1044. By Olivier Tilloy on 2015-05-22

Add unit tests for audio and video media types.

1045. By Olivier Tilloy on 2015-05-22

Refactor context menu unit tests to be data-driven.

1046. By Olivier Tilloy on 2015-05-22

Add mediaFlags property.

1047. By Olivier Tilloy on 2015-05-22

Add WebView.executeEditingCommand() API.

1048. By Olivier Tilloy on 2015-05-22

Rename saveImage() to saveMedia().

1049. By Olivier Tilloy on 2015-05-22

Do not store a reference to the active context menu, this is unused.

[Olivier Tilloy (osomon)]

Addressed all your comments but that one:

> It doesn't look like ContextMenuParams::link_text is used in Chrome.
> Does it need to be exposed here?

It’s not used, but it sounds like it could potentially be useful to embedders (for e.g. sharing a URL and associated text), and since it’s not really cluttering the API I left it there. I’ll remove it if you insist though :)

[lp:~osomon/oxide/context-menu]

1050. By Olivier Tilloy on 2015-05-22

Merge the latest changes from trunk and resolve a conflict.

[Chris Coulson (chrisccoulson)]

Thanks. There's just a couple of minor comments inline, but other than that, this looks ok

review: Approve

[lp:~osomon/oxide/context-menu]

1051. By Olivier Tilloy on 2015-05-26

Rename EditFlags to EditCapabilityFlags.

1052. By Olivier Tilloy on 2015-05-26

Rename MediaFlags to MediaStatusFlags.

1053. By Olivier Tilloy on 2015-05-26

Remove unused code.

1054. By Olivier Tilloy on 2015-05-26

Overlooked one rename.

1055. By Olivier Tilloy on 2015-05-26

Forgot a few more renames in tests.

=== added file 'qt/core/browser/oxide_qt_web_context_menu.cc'
--- qt/core/browser/oxide_qt_web_context_menu.cc	1970-01-01 00:00:00 +0000
+++ qt/core/browser/oxide_qt_web_context_menu.cc	2015-05-26 19:54:24 +0000
@@ -0,0 +1,183 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2015 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_qt_web_context_menu.h"
+
+#include <QPoint>
+#include <QString>
+#include <QUrl>
+
+#include "base/strings/utf_string_conversions.h"
+
+#include "qt/core/glue/oxide_qt_web_context_menu_proxy.h"
+
+namespace oxide {
+namespace qt {
+
+WebContextMenu::~WebContextMenu() {}
+
+void WebContextMenu::Show() {
+  proxy_->Show();
+}
+
+void WebContextMenu::Hide() {
+  proxy_->Hide();
+}
+
+MediaType WebContextMenu::mediaType() const {
+  switch (params_.media_type) {
+    case blink::WebContextMenuData::MediaTypeNone:
+    case blink::WebContextMenuData::MediaTypeFile:
+      return MEDIA_TYPE_NONE;
+    case blink::WebContextMenuData::MediaTypeImage:
+      return MEDIA_TYPE_IMAGE;
+    case blink::WebContextMenuData::MediaTypeVideo:
+      return MEDIA_TYPE_VIDEO;
+    case blink::WebContextMenuData::MediaTypeAudio:
+      return MEDIA_TYPE_AUDIO;
+    case blink::WebContextMenuData::MediaTypeCanvas:
+      return MEDIA_TYPE_CANVAS;
+    case blink::WebContextMenuData::MediaTypePlugin:
+      return MEDIA_TYPE_PLUGIN;
+    default:
+      Q_UNREACHABLE();
+  }
+}
+
+QPoint WebContextMenu::position() const {
+  return QPoint(params_.x, params_.y);
+}
+
+QUrl WebContextMenu::linkUrl() const {
+  return QUrl(QString::fromStdString(params_.link_url.spec()));
+}
+
+QString WebContextMenu::linkText() const {
+  return QString::fromStdString(base::UTF16ToUTF8(params_.link_text));
+}
+
+QUrl WebContextMenu::unfilteredLinkUrl() const {
+  return QUrl(QString::fromStdString(params_.unfiltered_link_url.spec()));
+}
+
+QUrl WebContextMenu::srcUrl() const {
+  return QUrl(QString::fromStdString(params_.src_url.spec()));
+}
+
+bool WebContextMenu::hasImageContents() const {
+  return params_.has_image_contents;
+}
+
+QUrl WebContextMenu::pageUrl() const {
+  return QUrl(QString::fromStdString(params_.page_url.spec()));
+}
+
+QUrl WebContextMenu::frameUrl() const {
+  return QUrl(QString::fromStdString(params_.frame_url.spec()));
+}
+
+QString WebContextMenu::selectionText() const {
+  return QString::fromStdString(base::UTF16ToUTF8(params_.selection_text));
+}
+
+bool WebContextMenu::isEditable() const {
+  return params_.is_editable;
+}
+
+void WebContextMenu::cancel() {
+  Close();
+}
+
+int WebContextMenu::editFlags() const {
+  int flags = NO_CAPABILITY;
+  if (params_.edit_flags & blink::WebContextMenuData::CanUndo) {
+    flags |= UNDO_CAPABILITY;
+  }
+  if (params_.edit_flags & blink::WebContextMenuData::CanRedo) {
+    flags |= REDO_CAPABILITY;
+  }
+  if (params_.edit_flags & blink::WebContextMenuData::CanCut) {
+    flags |= CUT_CAPABILITY;
+  }
+  if (params_.edit_flags & blink::WebContextMenuData::CanCopy) {
+    flags |= COPY_CAPABILITY;
+  }
+  if (params_.edit_flags & blink::WebContextMenuData::CanPaste) {
+    flags |= PASTE_CAPABILITY;
+  }
+  if (params_.edit_flags & blink::WebContextMenuData::CanDelete) {
+    flags |= ERASE_CAPABILITY;
+  }
+  if (params_.edit_flags & blink::WebContextMenuData::CanSelectAll) {
+    flags |= SELECT_ALL_CAPABILITY;
+  }
+  return flags;
+}
+
+int WebContextMenu::mediaFlags() const {
+  int flags = MEDIA_STATUS_NONE;
+  if (params_.media_flags & blink::WebContextMenuData::MediaInError) {
+    flags |= MEDIA_STATUS_IN_ERROR;
+  }
+  if (params_.media_flags & blink::WebContextMenuData::MediaPaused) {
+    flags |= MEDIA_STATUS_PAUSED;
+  }
+  if (params_.media_flags & blink::WebContextMenuData::MediaMuted) {
+    flags |= MEDIA_STATUS_MUTED;
+  }
+  if (params_.media_flags & blink::WebContextMenuData::MediaLoop) {
+    flags |= MEDIA_STATUS_LOOP;
+  }
+  if (params_.media_flags & blink::WebContextMenuData::MediaCanSave) {
+    flags |= MEDIA_STATUS_CAN_SAVE;
+  }
+  if (params_.media_flags & blink::WebContextMenuData::MediaHasAudio) {
+    flags |= MEDIA_STATUS_HAS_AUDIO;
+  }
+  if (params_.media_flags & blink::WebContextMenuData::MediaCanToggleControls) {
+    flags |= MEDIA_STATUS_CAN_TOGGLE_CONTROLS;
+  }
+  if (params_.media_flags & blink::WebContextMenuData::MediaControls) {
+    flags |= MEDIA_STATUS_CONTROLS;
+  }
+  if (params_.media_flags & blink::WebContextMenuData::MediaCanPrint) {
+    flags |= MEDIA_STATUS_CAN_PRINT;
+  }
+  if (params_.media_flags & blink::WebContextMenuData::MediaCanRotate) {
+    flags |= MEDIA_STATUS_CAN_ROTATE;
+  }
+  return flags;
+}
+
+void WebContextMenu::saveLink() const {
+  SaveLink();
+}
+
+void WebContextMenu::saveMedia() const {
+  SaveMedia();
+}
+
+WebContextMenu::WebContextMenu(content::RenderFrameHost* rfh,
+                               const content::ContextMenuParams& params)
+    : oxide::WebContextMenu(rfh, params) {}
+
+void WebContextMenu::SetProxy(WebContextMenuProxy* proxy) {
+  proxy_.reset(proxy);
+}
+
+} // namespace qt
+} // namespace oxide

=== added file 'qt/core/browser/oxide_qt_web_context_menu.h'
--- qt/core/browser/oxide_qt_web_context_menu.h	1970-01-01 00:00:00 +0000
+++ qt/core/browser/oxide_qt_web_context_menu.h	2015-05-26 19:54:24 +0000
@@ -0,0 +1,73 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2015 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_BROWSER_WEB_CONTEXT_MENU_H_
+#define _OXIDE_QT_CORE_BROWSER_WEB_CONTEXT_MENU_H_
+
+#include "base/macros.h"
+#include "base/memory/scoped_ptr.h"
+
+#include "qt/core/glue/oxide_qt_web_context_menu_proxy_client.h"
+#include "shared/browser/oxide_web_context_menu.h"
+
+namespace oxide {
+namespace qt {
+
+class WebContextMenuProxy;
+
+class WebContextMenu : public oxide::WebContextMenu,
+                       public WebContextMenuProxyClient {
+ public:
+  WebContextMenu(content::RenderFrameHost* rfh,
+                 const content::ContextMenuParams& params);
+
+  void SetProxy(WebContextMenuProxy* proxy);
+
+ private:
+  ~WebContextMenu() override;
+
+  // oxide::WebContextMenu implementation
+  void Show() override;
+  void Hide() override;
+
+  // WebContextMenuProxyClient implementation
+  MediaType mediaType() const override;
+  QPoint position() const override;
+  QUrl linkUrl() const override;
+  QString linkText() const override;
+  QUrl unfilteredLinkUrl() const override;
+  QUrl srcUrl() const override;
+  bool hasImageContents() const override;
+  QUrl pageUrl() const override;
+  QUrl frameUrl() const override;
+  QString selectionText() const override;
+  bool isEditable() const override;
+  void cancel() override;
+  int editFlags() const override;
+  int mediaFlags() const override;
+  void saveLink() const override;
+  void saveMedia() const override;
+
+  scoped_ptr<WebContextMenuProxy> proxy_;
+
+  DISALLOW_COPY_AND_ASSIGN(WebContextMenu);
+};
+
+} // namespace qt
+} // namespace oxide
+
+#endif // _OXIDE_QT_CORE_BROWSER_WEB_CONTEXT_MENU_H_

=== modified file 'qt/core/browser/oxide_qt_web_view.cc'
--- qt/core/browser/oxide_qt_web_view.cc	2015-05-22 16:06:07 +0000
+++ qt/core/browser/oxide_qt_web_view.cc	2015-05-26 19:54:24 +0000
@@ -85,6 +85,7 @@
 #include "oxide_qt_javascript_dialog.h"
 #include "oxide_qt_script_message_handler.h"
 #include "oxide_qt_web_context.h"
+#include "oxide_qt_web_context_menu.h"
 #include "oxide_qt_web_frame.h"
 #include "oxide_qt_web_popup_menu.h"
 #include "oxide_qt_web_preferences.h"
@@ -796,6 +797,14 @@
   return WebFrame::FromProxyHandle(handle);
 }
 
+oxide::WebContextMenu* WebView::CreateContextMenu(
+    content::RenderFrameHost* rfh,
+    const content::ContextMenuParams& params) {
+  WebContextMenu* menu = new WebContextMenu(rfh, params);
+  menu->SetProxy(client_->CreateWebContextMenu(menu));
+  return menu;
+}
+
 oxide::WebPopupMenu* WebView::CreatePopupMenu(content::RenderFrameHost* rfh) {
   WebPopupMenu* menu = new WebPopupMenu(rfh);
   menu->SetProxy(client_->CreateWebPopupMenu(menu));
@@ -1522,6 +1531,32 @@
   }
 }
 
+void WebView::executeEditingCommand(EditingCommands command) const {
+  content::WebContents* contents = view_->GetWebContents();
+  if (!contents) {
+    return;
+  }
+
+  switch (command) {
+    case EDITING_COMMAND_UNDO:
+      return contents->Undo();
+    case EDITING_COMMAND_REDO:
+      return contents->Redo();
+    case EDITING_COMMAND_CUT:
+      return contents->Cut();
+    case EDITING_COMMAND_COPY:
+      return contents->Copy();
+    case EDITING_COMMAND_PASTE:
+      return contents->Paste();
+    case EDITING_COMMAND_ERASE:
+      return contents->Delete();
+    case EDITING_COMMAND_SELECT_ALL:
+      return contents->SelectAll();
+    default:
+      NOTREACHED();
+  }
+}
+
 WebView::WebView(WebViewProxyClient* client)
     : view_(new oxide::WebView(this)),
       client_(client),

=== modified file 'qt/core/browser/oxide_qt_web_view.h'
--- qt/core/browser/oxide_qt_web_view.h	2015-05-22 16:06:07 +0000
+++ qt/core/browser/oxide_qt_web_view.h	2015-05-26 19:54:24 +0000
@@ -148,6 +148,9 @@
                               bool user_gesture) override;
   oxide::WebFrame* CreateWebFrame(
       content::RenderFrameHost* render_frame_host) override;
+  oxide::WebContextMenu* CreateContextMenu(
+      content::RenderFrameHost* rfh,
+      const content::ContextMenuParams& params) override;
   oxide::WebPopupMenu* CreatePopupMenu(content::RenderFrameHost* rfh) override;
   oxide::WebView* CreateNewWebView(const gfx::Rect& initial_pos,
                                    WindowOpenDisposition disposition) override;
@@ -269,6 +272,8 @@
 
   WebProcessStatus webProcessStatus() const override;
 
+  void executeEditingCommand(EditingCommands command) const override;
+
   scoped_ptr<oxide::WebView> view_;
 
   WebViewProxyClient* client_;

=== modified file 'qt/core/core.gyp'
--- qt/core/core.gyp	2015-05-25 13:33:47 +0000
+++ qt/core/core.gyp	2015-05-26 19:54:24 +0000
@@ -90,6 +90,8 @@
         'browser/oxide_qt_user_script.h',
         'browser/oxide_qt_web_context.cc',
         'browser/oxide_qt_web_context.h',
+        'browser/oxide_qt_web_context_menu.cc',
+        'browser/oxide_qt_web_context_menu.h',
         'browser/oxide_qt_web_frame.cc',
         'browser/oxide_qt_web_frame.h',
         'browser/oxide_qt_web_popup_menu.cc',
@@ -121,6 +123,8 @@
         'glue/oxide_qt_user_script_proxy.cc',
         'glue/oxide_qt_user_script_proxy.h',
         'glue/oxide_qt_user_script_proxy_client.h',
+        'glue/oxide_qt_web_context_menu_proxy.h',
+        'glue/oxide_qt_web_context_menu_proxy_client.h',
         'glue/oxide_qt_web_context_proxy.cc',
         'glue/oxide_qt_web_context_proxy.h',
         'glue/oxide_qt_web_context_proxy_client.h',

=== added file 'qt/core/glue/oxide_qt_web_context_menu_proxy.h'
--- qt/core/glue/oxide_qt_web_context_menu_proxy.h	1970-01-01 00:00:00 +0000
+++ qt/core/glue/oxide_qt_web_context_menu_proxy.h	2015-05-26 19:54:24 +0000
@@ -0,0 +1,35 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2015 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_GLUE_WEB_CONTEXT_MENU_PROXY_H_
+#define _OXIDE_QT_CORE_GLUE_WEB_CONTEXT_MENU_PROXY_H_
+
+namespace oxide {
+namespace qt {
+
+class WebContextMenuProxy {
+ public:
+  virtual ~WebContextMenuProxy() {}
+
+  virtual void Show() = 0;
+  virtual void Hide() = 0;
+};
+
+} // namespace qt
+} // namespace oxide
+
+#endif // _OXIDE_QT_CORE_GLUE_WEB_CONTEXT_MENU_PROXY_H_

=== added file 'qt/core/glue/oxide_qt_web_context_menu_proxy_client.h'
--- qt/core/glue/oxide_qt_web_context_menu_proxy_client.h	1970-01-01 00:00:00 +0000
+++ qt/core/glue/oxide_qt_web_context_menu_proxy_client.h	2015-05-26 19:54:24 +0000
@@ -0,0 +1,92 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2015 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_GLUE_WEB_CONTEXT_MENU_PROXY_CLIENT_H_
+#define _OXIDE_QT_CORE_GLUE_WEB_CONTEXT_MENU_PROXY_CLIENT_H_
+
+#include <QPoint>
+#include <QString>
+#include <QtGlobal>
+#include <QUrl>
+
+namespace oxide {
+namespace qt {
+
+enum EditCapabilityFlags {
+  NO_CAPABILITY = 0,
+  UNDO_CAPABILITY = 1 << 0,
+  REDO_CAPABILITY = 1 << 1,
+  CUT_CAPABILITY = 1 << 2,
+  COPY_CAPABILITY = 1 << 3,
+  PASTE_CAPABILITY = 1 << 4,
+  ERASE_CAPABILITY = 1 << 5,
+  SELECT_ALL_CAPABILITY = 1 << 6
+};
+
+enum MediaType {
+  MEDIA_TYPE_NONE,
+  MEDIA_TYPE_IMAGE,
+  MEDIA_TYPE_VIDEO,
+  MEDIA_TYPE_AUDIO,
+  MEDIA_TYPE_CANVAS,
+  MEDIA_TYPE_PLUGIN
+};
+
+enum MediaStatusFlags {
+  MEDIA_STATUS_NONE = 0,
+  MEDIA_STATUS_IN_ERROR = 1 << 0,
+  MEDIA_STATUS_PAUSED = 1 << 1,
+  MEDIA_STATUS_MUTED = 1 << 2,
+  MEDIA_STATUS_LOOP = 1 << 3,
+  MEDIA_STATUS_CAN_SAVE = 1 << 4,
+  MEDIA_STATUS_HAS_AUDIO = 1 << 5,
+  MEDIA_STATUS_CAN_TOGGLE_CONTROLS = 1 << 6,
+  MEDIA_STATUS_CONTROLS = 1 << 7,
+  MEDIA_STATUS_CAN_PRINT = 1 << 8,
+  MEDIA_STATUS_CAN_ROTATE = 1 << 9
+};
+
+class WebContextMenuProxyClient {
+ public:
+  virtual ~WebContextMenuProxyClient() {}
+
+  virtual MediaType mediaType() const = 0;
+  virtual QPoint position() const = 0;
+  virtual QUrl linkUrl() const = 0;
+  virtual QString linkText() const = 0;
+  virtual QUrl unfilteredLinkUrl() const = 0;
+  virtual QUrl srcUrl() const = 0;
+  virtual bool hasImageContents() const = 0;
+  virtual QUrl pageUrl() const = 0;
+  virtual QUrl frameUrl() const = 0;
+  virtual QString selectionText() const = 0;
+  virtual bool isEditable() const = 0;
+
+  virtual void cancel() = 0;
+
+  virtual int editFlags() const = 0;
+
+  virtual int mediaFlags() const = 0;
+
+  virtual void saveLink() const = 0;
+  virtual void saveMedia() const = 0;
+};
+
+} // namespace qt
+} // namespace oxide
+
+#endif // _OXIDE_QT_CORE_GLUE_WEB_CONTEXT_MENU_PROXY_CLIENT_H_

=== modified file 'qt/core/glue/oxide_qt_web_view_proxy.h'
--- qt/core/glue/oxide_qt_web_view_proxy.h	2015-05-19 10:08:59 +0000
+++ qt/core/glue/oxide_qt_web_view_proxy.h	2015-05-26 19:54:24 +0000
@@ -83,6 +83,16 @@
   WEB_PROCESS_CRASHED
 };
 
+enum EditingCommands {
+  EDITING_COMMAND_UNDO,
+  EDITING_COMMAND_REDO,
+  EDITING_COMMAND_CUT,
+  EDITING_COMMAND_COPY,
+  EDITING_COMMAND_PASTE,
+  EDITING_COMMAND_ERASE,
+  EDITING_COMMAND_SELECT_ALL
+};
+
 class CompositorFrameHandle {
  public:
   virtual ~CompositorFrameHandle() {}
@@ -215,6 +225,8 @@
   virtual void locationBarHide(bool animate) = 0;
 
   virtual WebProcessStatus webProcessStatus() const = 0;
+
+  virtual void executeEditingCommand(EditingCommands command) const = 0;
 };
 
 OXIDE_Q_DECL_PROXY_HANDLE(WebViewProxy);

=== modified file 'qt/core/glue/oxide_qt_web_view_proxy_client.h'
--- qt/core/glue/oxide_qt_web_view_proxy_client.h	2015-05-19 10:08:59 +0000
+++ qt/core/glue/oxide_qt_web_view_proxy_client.h	2015-05-26 19:54:24 +0000
@@ -47,6 +47,8 @@
 class FilePickerProxy;
 class FilePickerProxyClient;
 class JavaScriptDialogProxy;
+class WebContextMenuProxy;
+class WebContextMenuProxyClient;
 class WebFrameProxy;
 class WebPopupMenuProxy;
 class WebPopupMenuProxyClient;
@@ -71,6 +73,8 @@
 
   virtual QObject* GetApiHandle() = 0;
 
+  virtual WebContextMenuProxy* CreateWebContextMenu(
+      WebContextMenuProxyClient* client) = 0;
   virtual WebPopupMenuProxy* CreateWebPopupMenu(
       WebPopupMenuProxyClient* client) = 0;
   virtual JavaScriptDialogProxy* CreateJavaScriptDialog(

=== modified file 'qt/quick/CMakeLists.txt'
--- qt/quick/CMakeLists.txt	2015-04-09 16:41:51 +0000
+++ qt/quick/CMakeLists.txt	2015-05-26 19:54:24 +0000
@@ -1,6 +1,6 @@
 # vim:expandtab:shiftwidth=2:tabstop=2:
 
-# Copyright (C) 2014 Canonical Ltd.
+# Copyright (C) 2014-2015 Canonical Ltd.
 
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -45,6 +45,7 @@
     oxide_qquick_javascript_dialog.cc
     oxide_qquick_prompt_dialog.cc
     oxide_qquick_software_frame_node.cc
+    oxide_qquick_web_context_menu.cc
     oxide_qquick_web_popup_menu.cc
     ${MOC_EXTRA})
 

=== modified file 'qt/quick/api/oxideqquickwebview.cc'
--- qt/quick/api/oxideqquickwebview.cc	2015-05-19 10:08:59 +0000
+++ qt/quick/api/oxideqquickwebview.cc	2015-05-26 19:54:24 +0000
@@ -55,6 +55,7 @@
 #include "qt/quick/oxide_qquick_init.h"
 #include "qt/quick/oxide_qquick_prompt_dialog.h"
 #include "qt/quick/oxide_qquick_software_frame_node.h"
+#include "qt/quick/oxide_qquick_web_context_menu.h"
 #include "qt/quick/oxide_qquick_web_popup_menu.h"
 
 #include "oxideqquicklocationbarcontroller_p.h"
@@ -225,6 +226,7 @@
     load_progress_(0),
     constructed_(false),
     navigation_history_(view),
+    context_menu_(nullptr),
     popup_menu_(nullptr),
     alert_dialog_(nullptr),
     confirm_dialog_(nullptr),
@@ -270,6 +272,13 @@
   return q;
 }
 
+oxide::qt::WebContextMenuProxy* OxideQQuickWebViewPrivate::CreateWebContextMenu(
+    oxide::qt::WebContextMenuProxyClient* client) {
+  Q_Q(OxideQQuickWebView);
+
+  return new oxide::qquick::WebContextMenu(q, client);
+}
+
 oxide::qt::WebPopupMenuProxy* OxideQQuickWebViewPrivate::CreateWebPopupMenu(
     oxide::qt::WebPopupMenuProxyClient* client) {
   Q_Q(OxideQQuickWebView);
@@ -1387,6 +1396,23 @@
       d)->proxy()->compositorFrameScrollOffsetPix().y();
 }
 
+QQmlComponent* OxideQQuickWebView::contextMenu() const {
+  Q_D(const OxideQQuickWebView);
+
+  return d->context_menu_;
+}
+
+void OxideQQuickWebView::setContextMenu(QQmlComponent* context_menu) {
+  Q_D(OxideQQuickWebView);
+
+  if (d->context_menu_ == context_menu) {
+    return;
+  }
+
+  d->context_menu_ = context_menu;
+  emit contextMenuChanged();
+}
+
 QQmlComponent* OxideQQuickWebView::popupMenu() const {
   Q_D(const OxideQQuickWebView);
 
@@ -1697,6 +1723,35 @@
   return new OxideQQuickWebViewAttached(object);
 }
 
+void OxideQQuickWebView::executeEditingCommand(EditingCommands command) const {
+  Q_D(const OxideQQuickWebView);
+
+  Q_STATIC_ASSERT(
+      EditingCommandUndo ==
+        static_cast<EditingCommands>(oxide::qt::EDITING_COMMAND_UNDO));
+  Q_STATIC_ASSERT(
+      EditingCommandRedo ==
+        static_cast<EditingCommands>(oxide::qt::EDITING_COMMAND_REDO));
+  Q_STATIC_ASSERT(
+      EditingCommandCut ==
+        static_cast<EditingCommands>(oxide::qt::EDITING_COMMAND_CUT));
+  Q_STATIC_ASSERT(
+      EditingCommandCopy ==
+        static_cast<EditingCommands>(oxide::qt::EDITING_COMMAND_COPY));
+  Q_STATIC_ASSERT(
+      EditingCommandPaste ==
+        static_cast<EditingCommands>(oxide::qt::EDITING_COMMAND_PASTE));
+  Q_STATIC_ASSERT(
+      EditingCommandErase ==
+        static_cast<EditingCommands>(oxide::qt::EDITING_COMMAND_ERASE));
+  Q_STATIC_ASSERT(
+      EditingCommandSelectAll ==
+        static_cast<EditingCommands>(oxide::qt::EDITING_COMMAND_SELECT_ALL));
+
+  d->proxy()->executeEditingCommand(
+      static_cast<oxide::qt::EditingCommands>(command));
+}
+
 void OxideQQuickWebView::goBack() {
   Q_D(OxideQQuickWebView);
 

=== modified file 'qt/quick/api/oxideqquickwebview_p.h'
--- qt/quick/api/oxideqquickwebview_p.h	2015-05-19 10:08:59 +0000
+++ qt/quick/api/oxideqquickwebview_p.h	2015-05-26 19:54:24 +0000
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2013 Canonical Ltd.
+// Copyright (C) 2013-2015 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -71,7 +71,11 @@
   Q_OBJECT
 
   Q_FLAGS(ContentType)
+  Q_FLAGS(EditCapabilities)
+  Q_FLAGS(MediaStatus)
+  Q_ENUMS(EditingCommands);
   Q_ENUMS(LogMessageSeverityLevel);
+  Q_ENUMS(MediaType);
   Q_ENUMS(RestoreType);
   Q_ENUMS(WebProcessStatus);
 
@@ -94,6 +98,7 @@
   Q_PROPERTY(qreal contentX READ contentX NOTIFY contentXChanged)
   Q_PROPERTY(qreal contentY READ contentY NOTIFY contentYChanged)
 
+  Q_PROPERTY(QQmlComponent* contextMenu READ contextMenu WRITE setContextMenu NOTIFY contextMenuChanged REVISION 4)
   Q_PROPERTY(QQmlComponent* popupMenu READ popupMenu WRITE setPopupMenu NOTIFY popupMenuChanged)
 
   Q_PROPERTY(QQmlComponent* alertDialog READ alertDialog WRITE setAlertDialog NOTIFY alertDialogChanged)
@@ -163,6 +168,52 @@
     WebProcessCrashed
   };
 
+  enum EditCapabilityFlags {
+    NoCapability = 0,
+    UndoCapability = 1 << 0,
+    RedoCapability = 1 << 1,
+    CutCapability = 1 << 2,
+    CopyCapability = 1 << 3,
+    PasteCapability = 1 << 4,
+    EraseCapability = 1 << 5,
+    SelectAllCapability = 1 << 6
+  };
+  Q_DECLARE_FLAGS(EditCapabilities, EditCapabilityFlags)
+
+  enum MediaType {
+    MediaTypeNone,
+    MediaTypeImage,
+    MediaTypeVideo,
+    MediaTypeAudio,
+    MediaTypeCanvas,
+    MediaTypePlugin
+  };
+
+  enum MediaStatusFlags {
+    MediaStatusNone = 0,
+    MediaStatusInError = 1 << 0,
+    MediaStatusPaused = 1 << 1,
+    MediaStatusMuted = 1 << 2,
+    MediaStatusLoop = 1 << 3,
+    MediaStatusCanSave = 1 << 4,
+    MediaStatusHasAudio = 1 << 5,
+    MediaStatusCanToggleControls = 1 << 6,
+    MediaStatusControls = 1 << 7,
+    MediaStatusCanPrint = 1 << 8,
+    MediaStatusCanRotate = 1 << 9
+  };
+  Q_DECLARE_FLAGS(MediaStatus, MediaStatusFlags)
+
+  enum EditingCommands {
+    EditingCommandUndo,
+    EditingCommandRedo,
+    EditingCommandCut,
+    EditingCommandCopy,
+    EditingCommandPaste,
+    EditingCommandErase,
+    EditingCommandSelectAll
+  };
+
   void componentComplete();
 
   QUrl url() const;
@@ -198,6 +249,9 @@
   qreal contentX() const;
   qreal contentY() const;
 
+  QQmlComponent* contextMenu() const;
+  void setContextMenu(QQmlComponent* context_menu);
+
   QQmlComponent* popupMenu() const;
   void setPopupMenu(QQmlComponent* popup_menu);
 
@@ -244,6 +298,8 @@
 
   OxideQFindController* findController() const;
 
+  Q_REVISION(4) Q_INVOKABLE void executeEditingCommand(EditingCommands command) const;
+
  public Q_SLOTS:
   void goBack();
   void goForward();
@@ -269,6 +325,7 @@
   void rootFrameChanged();
   void frameAdded(OxideQQuickWebFrame* frame);
   void frameRemoved(OxideQQuickWebFrame* frame);
+  Q_REVISION(4) void contextMenuChanged();
   void popupMenuChanged();
   void alertDialogChanged();
   void confirmDialogChanged();

=== modified file 'qt/quick/api/oxideqquickwebview_p_p.h'
--- qt/quick/api/oxideqquickwebview_p_p.h	2015-05-19 10:08:59 +0000
+++ qt/quick/api/oxideqquickwebview_p_p.h	2015-05-26 19:54:24 +0000
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2013 Canonical Ltd.
+// Copyright (C) 2013-2015 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -84,6 +84,8 @@
   // oxide::qt::WebViewProxyClient implementation
   void Initialized() override;
   QObject* GetApiHandle() override;
+  oxide::qt::WebContextMenuProxy* CreateWebContextMenu(
+      oxide::qt::WebContextMenuProxyClient* client) override;
   oxide::qt::WebPopupMenuProxy* CreateWebPopupMenu(
       oxide::qt::WebPopupMenuProxyClient* client) override;
   oxide::qt::JavaScriptDialogProxy* CreateJavaScriptDialog(
@@ -176,6 +178,7 @@
   int load_progress_;
   QUrl icon_;
   OxideQQuickNavigationHistory navigation_history_;
+  QQmlComponent* context_menu_;
   QQmlComponent* popup_menu_;
   QQmlComponent* alert_dialog_;
   QQmlComponent* confirm_dialog_;

=== added file 'qt/quick/oxide_qquick_web_context_menu.cc'
--- qt/quick/oxide_qquick_web_context_menu.cc	1970-01-01 00:00:00 +0000
+++ qt/quick/oxide_qquick_web_context_menu.cc	2015-05-26 19:54:24 +0000
@@ -0,0 +1,311 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2015 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_qquick_web_context_menu.h"
+
+#include <QPointF>
+#include <QObject>
+#include <QQmlComponent>
+#include <QQmlContext>
+#include <QQmlEngine>
+#include <QQuickItem>
+#include <QtDebug>
+#include <QUrl>
+
+#include "qt/core/glue/oxide_qt_web_context_menu_proxy_client.h"
+#include "qt/quick/api/oxideqquickwebview_p.h"
+#include "qt/quick/api/oxideqquickwebview_p_p.h"
+
+namespace oxide {
+namespace qquick {
+
+namespace {
+
+class ContextMenuContext : public QObject {
+  Q_OBJECT
+
+  Q_PROPERTY(OxideQQuickWebView::MediaType mediaType READ mediaType CONSTANT FINAL)
+  Q_PROPERTY(QPointF position READ position CONSTANT FINAL)
+  Q_PROPERTY(QUrl linkUrl READ linkUrl CONSTANT FINAL)
+  Q_PROPERTY(QString linkText READ linkText CONSTANT FINAL)
+  Q_PROPERTY(QUrl unfilteredLinkUrl READ unfilteredLinkUrl CONSTANT FINAL)
+  Q_PROPERTY(QUrl srcUrl READ srcUrl CONSTANT FINAL)
+  Q_PROPERTY(bool hasImageContents READ hasImageContents CONSTANT FINAL)
+  Q_PROPERTY(QUrl pageUrl READ pageUrl CONSTANT FINAL)
+  Q_PROPERTY(QUrl frameUrl READ frameUrl CONSTANT FINAL)
+  Q_PROPERTY(QString selectionText READ selectionText CONSTANT FINAL)
+  Q_PROPERTY(bool isEditable READ isEditable CONSTANT FINAL)
+  Q_PROPERTY(OxideQQuickWebView::EditCapabilities editFlags READ editFlags CONSTANT FINAL)
+  Q_PROPERTY(OxideQQuickWebView::MediaStatus mediaFlags READ mediaFlags CONSTANT FINAL)
+
+ public:
+  virtual ~ContextMenuContext() {}
+  ContextMenuContext(oxide::qt::WebContextMenuProxyClient* client);
+
+  OxideQQuickWebView::MediaType mediaType() const;
+  QPointF position() const;
+  QUrl linkUrl() const;
+  QString linkText() const;
+  QUrl unfilteredLinkUrl() const;
+  QUrl srcUrl() const;
+  bool hasImageContents() const;
+  QUrl pageUrl() const;
+  QUrl frameUrl() const;
+  QString selectionText() const;
+  bool isEditable() const;
+  OxideQQuickWebView::EditCapabilities editFlags() const;
+  OxideQQuickWebView::MediaStatus mediaFlags() const;
+
+  Q_INVOKABLE void saveLink() const;
+  Q_INVOKABLE void saveMedia() const;
+
+  Q_INVOKABLE void close();
+
+ private:
+  oxide::qt::WebContextMenuProxyClient* client_;
+};
+
+ContextMenuContext::ContextMenuContext(
+    oxide::qt::WebContextMenuProxyClient* client) :
+    client_(client) {}
+
+OxideQQuickWebView::MediaType ContextMenuContext::mediaType() const {
+  Q_STATIC_ASSERT(
+      OxideQQuickWebView::MediaTypeNone ==
+        static_cast<OxideQQuickWebView::MediaType>(oxide::qt::MEDIA_TYPE_NONE));
+  Q_STATIC_ASSERT(
+      OxideQQuickWebView::MediaTypeImage ==
+        static_cast<OxideQQuickWebView::MediaType>(oxide::qt::MEDIA_TYPE_IMAGE));
+  Q_STATIC_ASSERT(
+      OxideQQuickWebView::MediaTypeVideo ==
+        static_cast<OxideQQuickWebView::MediaType>(oxide::qt::MEDIA_TYPE_VIDEO));
+  Q_STATIC_ASSERT(
+      OxideQQuickWebView::MediaTypeAudio ==
+        static_cast<OxideQQuickWebView::MediaType>(oxide::qt::MEDIA_TYPE_AUDIO));
+  Q_STATIC_ASSERT(
+      OxideQQuickWebView::MediaTypeCanvas ==
+        static_cast<OxideQQuickWebView::MediaType>(oxide::qt::MEDIA_TYPE_CANVAS));
+  Q_STATIC_ASSERT(
+      OxideQQuickWebView::MediaTypePlugin ==
+        static_cast<OxideQQuickWebView::MediaType>(oxide::qt::MEDIA_TYPE_PLUGIN));
+
+  return static_cast<OxideQQuickWebView::MediaType>(client_->mediaType());
+}
+
+QPointF ContextMenuContext::position() const {
+  return client_->position();
+}
+
+QUrl ContextMenuContext::linkUrl() const {
+  return client_->linkUrl();
+}
+
+QString ContextMenuContext::linkText() const {
+  return client_->linkText();
+}
+
+QUrl ContextMenuContext::unfilteredLinkUrl() const {
+  return client_->unfilteredLinkUrl();
+}
+
+QUrl ContextMenuContext::srcUrl() const {
+  return client_->srcUrl();
+}
+
+bool ContextMenuContext::hasImageContents() const {
+  return client_->hasImageContents();
+}
+
+QUrl ContextMenuContext::pageUrl() const {
+  return client_->pageUrl();
+}
+
+QUrl ContextMenuContext::frameUrl() const {
+  return client_->frameUrl();
+}
+
+QString ContextMenuContext::selectionText() const {
+  return client_->selectionText();
+}
+
+bool ContextMenuContext::isEditable() const {
+  return client_->isEditable();
+}
+
+OxideQQuickWebView::EditCapabilities ContextMenuContext::editFlags() const {
+  Q_STATIC_ASSERT(
+      OxideQQuickWebView::NoCapability ==
+        static_cast<OxideQQuickWebView::EditCapabilityFlags>(oxide::qt::NO_CAPABILITY));
+  Q_STATIC_ASSERT(
+      OxideQQuickWebView::UndoCapability ==
+        static_cast<OxideQQuickWebView::EditCapabilityFlags>(oxide::qt::UNDO_CAPABILITY));
+  Q_STATIC_ASSERT(
+      OxideQQuickWebView::RedoCapability ==
+        static_cast<OxideQQuickWebView::EditCapabilityFlags>(oxide::qt::REDO_CAPABILITY));
+  Q_STATIC_ASSERT(
+      OxideQQuickWebView::CutCapability ==
+        static_cast<OxideQQuickWebView::EditCapabilityFlags>(oxide::qt::CUT_CAPABILITY));
+  Q_STATIC_ASSERT(
+      OxideQQuickWebView::CopyCapability ==
+        static_cast<OxideQQuickWebView::EditCapabilityFlags>(oxide::qt::COPY_CAPABILITY));
+  Q_STATIC_ASSERT(
+      OxideQQuickWebView::PasteCapability ==
+        static_cast<OxideQQuickWebView::EditCapabilityFlags>(oxide::qt::PASTE_CAPABILITY));
+  Q_STATIC_ASSERT(
+      OxideQQuickWebView::EraseCapability ==
+        static_cast<OxideQQuickWebView::EditCapabilityFlags>(oxide::qt::ERASE_CAPABILITY));
+  Q_STATIC_ASSERT(
+      OxideQQuickWebView::SelectAllCapability ==
+        static_cast<OxideQQuickWebView::EditCapabilityFlags>(oxide::qt::SELECT_ALL_CAPABILITY));
+
+  return static_cast<OxideQQuickWebView::EditCapabilities>(client_->editFlags());
+}
+
+OxideQQuickWebView::MediaStatus ContextMenuContext::mediaFlags() const {
+  Q_STATIC_ASSERT(
+      OxideQQuickWebView::MediaStatusNone ==
+        static_cast<OxideQQuickWebView::MediaStatusFlags>(oxide::qt::MEDIA_STATUS_NONE));
+  Q_STATIC_ASSERT(
+      OxideQQuickWebView::MediaStatusInError ==
+        static_cast<OxideQQuickWebView::MediaStatusFlags>(oxide::qt::MEDIA_STATUS_IN_ERROR));
+  Q_STATIC_ASSERT(
+      OxideQQuickWebView::MediaStatusPaused ==
+        static_cast<OxideQQuickWebView::MediaStatusFlags>(oxide::qt::MEDIA_STATUS_PAUSED));
+  Q_STATIC_ASSERT(
+      OxideQQuickWebView::MediaStatusMuted ==
+        static_cast<OxideQQuickWebView::MediaStatusFlags>(oxide::qt::MEDIA_STATUS_MUTED));
+  Q_STATIC_ASSERT(
+      OxideQQuickWebView::MediaStatusLoop ==
+        static_cast<OxideQQuickWebView::MediaStatusFlags>(oxide::qt::MEDIA_STATUS_LOOP));
+  Q_STATIC_ASSERT(
+      OxideQQuickWebView::MediaStatusCanSave ==
+        static_cast<OxideQQuickWebView::MediaStatusFlags>(oxide::qt::MEDIA_STATUS_CAN_SAVE));
+  Q_STATIC_ASSERT(
+      OxideQQuickWebView::MediaStatusHasAudio ==
+        static_cast<OxideQQuickWebView::MediaStatusFlags>(oxide::qt::MEDIA_STATUS_HAS_AUDIO));
+  Q_STATIC_ASSERT(
+      OxideQQuickWebView::MediaStatusCanToggleControls ==
+        static_cast<OxideQQuickWebView::MediaStatusFlags>(oxide::qt::MEDIA_STATUS_CAN_TOGGLE_CONTROLS));
+  Q_STATIC_ASSERT(
+      OxideQQuickWebView::MediaStatusControls ==
+        static_cast<OxideQQuickWebView::MediaStatusFlags>(oxide::qt::MEDIA_STATUS_CONTROLS));
+  Q_STATIC_ASSERT(
+      OxideQQuickWebView::MediaStatusCanPrint ==
+        static_cast<OxideQQuickWebView::MediaStatusFlags>(oxide::qt::MEDIA_STATUS_CAN_PRINT));
+  Q_STATIC_ASSERT(
+      OxideQQuickWebView::MediaStatusCanRotate ==
+        static_cast<OxideQQuickWebView::MediaStatusFlags>(oxide::qt::MEDIA_STATUS_CAN_ROTATE));
+
+  return static_cast<OxideQQuickWebView::MediaStatus>(client_->mediaFlags());
+}
+
+void ContextMenuContext::saveLink() const {
+  if (linkUrl().isValid()) {
+    client_->saveLink();
+  } else {
+    qWarning() << "ContextMenuContext::saveLink(): not a valid link";
+  }
+}
+
+void ContextMenuContext::saveMedia() const {
+  OxideQQuickWebView::MediaType media_type = mediaType();
+  if ((media_type == OxideQQuickWebView::MediaTypeImage) ||
+      (media_type == OxideQQuickWebView::MediaTypeCanvas)) {
+    if (!hasImageContents()) {
+      qWarning() << "ContextMenuContext::saveMedia(): image has no contents";
+      return;
+    }
+  } else if ((media_type == OxideQQuickWebView::MediaTypeVideo) ||
+      (media_type == OxideQQuickWebView::MediaTypeAudio)) {
+    if (!mediaFlags().testFlag(OxideQQuickWebView::MediaStatusCanSave)) {
+      qWarning() << "ContextMenuContext::saveMedia(): cannot save media source";
+      return;
+    }
+  } else {
+    qWarning() << "ContextMenuContext::saveMedia(): invalid content";
+    return;
+  }
+
+  client_->saveMedia();
+}
+
+void ContextMenuContext::close() {
+  client_->cancel();
+}
+
+} // namespace
+
+void WebContextMenu::Show() {
+  if (!view_) {
+    qWarning() << "WebContextMenu::Show: Can't show after the view has gone";
+    client_->cancel();
+    return;
+  }
+
+  QQmlComponent* component = view_->contextMenu();
+  if (!component) {
+    qWarning() <<
+        "WebContextMenu::Show: Content requested a context menu, but the "
+        "application hasn't provided one";
+    client_->cancel();
+    return;
+  }
+
+  ContextMenuContext* contextObject = new ContextMenuContext(client_);
+
+  QQmlContext* baseContext = component->creationContext();
+  if (!baseContext) {
+    baseContext = QQmlEngine::contextForObject(view_);
+  }
+  context_.reset(new QQmlContext(baseContext));
+
+  context_->setContextProperty(QLatin1String("model"), contextObject);
+  context_->setContextObject(contextObject);
+  contextObject->setParent(context_.data());
+
+  item_.reset(qobject_cast<QQuickItem*>(
+      component->beginCreate(context_.data())));
+  if (!item_) {
+    qWarning() <<
+        "WebContextMenu::Show: Failed to create instance of Qml context menu component";
+    client_->cancel();
+    return;
+  }
+
+  OxideQQuickWebViewPrivate::get(view_)->addAttachedPropertyTo(item_.data());
+  item_->setParentItem(view_);
+
+  component->completeCreate();
+}
+
+void WebContextMenu::Hide() {
+  if (item_) {
+    item_->setVisible(false);
+  }
+}
+
+WebContextMenu::WebContextMenu(OxideQQuickWebView* view,
+                               oxide::qt::WebContextMenuProxyClient* client)
+    : client_(client),
+      view_(view) {}
+
+WebContextMenu::~WebContextMenu() {}
+
+} // namespace qquick
+} // namespace oxide
+
+#include "oxide_qquick_web_context_menu.moc"

=== added file 'qt/quick/oxide_qquick_web_context_menu.h'
--- qt/quick/oxide_qquick_web_context_menu.h	1970-01-01 00:00:00 +0000
+++ qt/quick/oxide_qquick_web_context_menu.h	2015-05-26 19:54:24 +0000
@@ -0,0 +1,61 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2015 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_QUICK_WEB_CONTEXT_MENU_H_
+#define _OXIDE_QT_QUICK_WEB_CONTEXT_MENU_H_
+
+#include <QPointer>
+#include <QScopedPointer>
+
+#include "qt/core/glue/oxide_qt_web_context_menu_proxy.h"
+
+class OxideQQuickWebView;
+
+QT_BEGIN_NAMESPACE
+class QQmlContext;
+class QQuickItem;
+QT_END_NAMESPACE
+
+namespace oxide {
+
+namespace qt {
+class WebContextMenuProxyClient;
+}
+
+namespace qquick {
+
+class WebContextMenu : public oxide::qt::WebContextMenuProxy {
+ public:
+  WebContextMenu(OxideQQuickWebView* view,
+                 oxide::qt::WebContextMenuProxyClient* client);
+  ~WebContextMenu() override;
+
+ private:
+  // oxide::qt::WebContextMenuProxy implementation
+  void Show() override;
+  void Hide() override;
+
+  oxide::qt::WebContextMenuProxyClient* client_;
+  QPointer<OxideQQuickWebView> view_;
+  QScopedPointer<QQuickItem> item_;
+  QScopedPointer<QQmlContext> context_;
+};
+
+} // namespace qquick
+} // namespace oxide
+
+#endif // _OXIDE_QT_QUICK_WEB_CONTEXT_MENU_H_

=== added file 'qt/tests/qmltests/api/buddha.mp4'
Binary files qt/tests/qmltests/api/buddha.mp4	1970-01-01 00:00:00 +0000 and qt/tests/qmltests/api/buddha.mp4	2015-05-26 19:54:24 +0000 differ
=== added file 'qt/tests/qmltests/api/cof.svg'
--- qt/tests/qmltests/api/cof.svg	1970-01-01 00:00:00 +0000
+++ qt/tests/qmltests/api/cof.svg	2015-05-26 19:54:24 +0000
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="285px" height="285px" viewBox="-0.866 -0.866 285 285" enable-background="new -0.866 -0.866 285 285"
+	 xml:space="preserve">
+<defs>
+</defs>
+<path fill="#DD4814" d="M283.465,141.734c0,78.273-63.457,141.73-141.734,141.73S0,220.008,0,141.734C0,63.455,63.453,0,141.73,0
+	S283.465,63.455,283.465,141.734z"/>
+<path fill="#FFFFFF" d="M45.356,122.812c-10.453,0-18.923,8.47-18.923,18.923c0,10.449,8.47,18.92,18.923,18.92
+	c10.449,0,18.92-8.471,18.92-18.92C64.276,131.281,55.806,122.812,45.356,122.812z M180.463,208.814
+	c-9.051,5.225-12.149,16.793-6.926,25.84c5.226,9.051,16.793,12.151,25.844,6.926c9.048-5.224,12.148-16.792,6.923-25.842
+	C201.08,206.691,189.511,203.59,180.463,208.814z M86.458,141.732c0-18.701,9.293-35.219,23.504-45.221L96.128,73.338
+	c-16.56,11.064-28.878,27.978-33.995,47.788c5.977,4.872,9.796,12.291,9.796,20.608c0,8.315-3.819,15.734-9.797,20.605
+	c5.116,19.812,17.435,36.726,33.995,47.789l13.835-23.175C95.751,176.953,86.458,160.436,86.458,141.732z M141.733,86.457
+	c28.877,0,52.564,22.141,55.047,50.373l26.968-0.394c-1.327-20.844-10.432-39.562-24.425-53.319
+	c-7.194,2.718-15.505,2.306-22.688-1.842c-7.192-4.152-11.705-11.156-12.941-18.757c-6.992-1.935-14.351-2.99-21.96-2.99
+	c-13.086,0-25.449,3.072-36.431,8.512l13.146,23.56C125.526,88.307,133.412,86.457,141.733,86.457z M141.733,197.008
+	c-8.322,0-16.207-1.85-23.285-5.143L105.3,215.427c10.983,5.438,23.347,8.511,36.433,8.511c7.609,0,14.968-1.055,21.961-2.99
+	c1.236-7.601,5.75-14.605,12.943-18.76c7.183-4.146,15.494-4.558,22.688-1.839c13.992-13.758,23.097-32.476,24.422-53.32
+	l-26.968-0.394C194.298,174.871,170.61,197.008,141.733,197.008z M180.46,74.649c9.05,5.227,20.619,2.126,25.842-6.921
+	c5.226-9.051,2.128-20.619-6.923-25.845c-9.049-5.224-20.617-2.124-25.843,6.927C168.312,57.857,171.412,69.426,180.46,74.649z"/>
+</svg>

=== added file 'qt/tests/qmltests/api/fire.oga'
Binary files qt/tests/qmltests/api/fire.oga	1970-01-01 00:00:00 +0000 and qt/tests/qmltests/api/fire.oga	2015-05-26 19:54:24 +0000 differ
=== added file 'qt/tests/qmltests/api/tst_WebView_contextMenu.html'
--- qt/tests/qmltests/api/tst_WebView_contextMenu.html	1970-01-01 00:00:00 +0000
+++ qt/tests/qmltests/api/tst_WebView_contextMenu.html	2015-05-26 19:54:24 +0000
@@ -0,0 +1,13 @@
+<html>
+<body>
+  <div id="text">some text</div>
+  <a id="hyperlink" href="empty.html" title="hyper-link">super-link</a>
+  <img id="image" src="cof.svg" alt="image" width="20px" height="20px" />
+  <canvas id="canvas" width="20px" height="20px"></canvas>
+  <textarea id="editable" rows="2" cols="10">text area</textarea>
+  <iframe id="iframe" src="empty.html" style="border: 0; width: 20px; height:20px;"></iframe>
+  <a href="empty.html"><img id="imagelink" src="cof.svg" width="20px" height="20px" /></a>
+  <video id="video" width="20px" height="20px" src="buddha.mp4" loop="true"></video>
+  <audio id="audio" src="fire.oga" controls="controls" style="width: 20px; height:20px;"></audio>
+</body>
+</html>

=== added file 'qt/tests/qmltests/api/tst_WebView_contextMenu.qml'
--- qt/tests/qmltests/api/tst_WebView_contextMenu.qml	1970-01-01 00:00:00 +0000
+++ qt/tests/qmltests/api/tst_WebView_contextMenu.qml	2015-05-26 19:54:24 +0000
@@ -0,0 +1,215 @@
+import QtQuick 2.0
+import QtTest 1.0
+import com.canonical.Oxide 1.8
+import com.canonical.Oxide.Testing 1.0
+
+TestWebView {
+  id: webView
+  focus: true
+  width: 200
+  height: 200
+
+  property var currentContextMenu: null
+  property url downloadUrl
+  property string downloadReferrer
+
+  contextMenu: Item {
+    property var contextModel: model
+    Component.onCompleted: WebView.view.currentContextMenu = this;
+    Component.onDestruction: WebView.view.currentContextMenu = null;
+  }
+
+  function waitForContextMenu() {
+    return waitFor(function() { return currentContextMenu != null; });
+  }
+
+  onDownloadRequested: {
+    downloadUrl = request.url;
+    downloadReferrer = request.referrer;
+  }
+
+  SignalSpy {
+    id: spy
+    target: webView
+    signalName: "downloadRequested"
+  }
+
+  TestCase {
+    name: "WebView_contextMenu"
+    when: windowShown
+
+    function init() {
+      webView.currentContextMenu = null;
+
+      webView.url = "http://testsuite/tst_WebView_contextMenu.html";
+      verify(webView.waitForLoadSucceeded(),
+             "Timed out waiting for successful load");
+
+      spy.clear();
+    }
+
+    function cleanup() {
+      webView.currentContextMenu.contextModel.close()
+      tryCompare(webView, "currentContextMenu", null);
+    }
+
+    function invokeContextMenu(id) {
+      var r = webView.getTestApi().getBoundingClientRectForSelector("#" + id);
+      var x = r.x + r.width / 2;
+      var y = r.y + r.height / 2;
+      mouseClick(webView, x, y, Qt.RightButton);
+      verify(webView.waitForContextMenu(),
+             "Timed out waiting for context menu to show");
+      var model = webView.currentContextMenu.contextModel;
+      compare(model.position, Qt.point(x, y));
+      compare(model.pageUrl, "http://testsuite/tst_WebView_contextMenu.html");
+    }
+
+    function test_WebView_contextMenu_properties_data() {
+      return [
+        { id: "text", mediaType: WebView.MediaTypeNone, linkUrl: "", linkText: "", srcUrl: "", frameUrl: "", isEditable: false },
+        { id: "hyperlink", mediaType: WebView.MediaTypeNone, linkUrl: "http://testsuite/empty.html", linkText: "super-link", srcUrl: "", frameUrl: "", isEditable: false },
+        { id: "image", mediaType: WebView.MediaTypeImage, linkUrl: "", linkText: "", srcUrl: "http://testsuite/cof.svg", frameUrl: "", isEditable: false },
+        { id: "canvas", mediaType: WebView.MediaTypeCanvas, linkUrl: "", linkText: "", srcUrl: "", frameUrl: "", isEditable: false },
+        { id: "editable", mediaType: WebView.MediaTypeNone, linkUrl: "", linkText: "", srcUrl: "", frameUrl: "", isEditable: true },
+        { id: "imagelink", mediaType: WebView.MediaTypeImage, linkUrl: "http://testsuite/empty.html", linkText: "", srcUrl: "http://testsuite/cof.svg", frameUrl: "", isEditable: false },
+        { id: "iframe", mediaType: WebView.MediaTypeNone, linkUrl: "", linkText: "", srcUrl: "", frameUrl: "http://testsuite/empty.html", isEditable: false },
+        { id: "video", mediaType: WebView.MediaTypeVideo, linkUrl: "", linkText: "", srcUrl: "http://testsuite/buddha.mp4", frameUrl: "", isEditable: false },
+        { id: "audio", mediaType: WebView.MediaTypeAudio, linkUrl: "", linkText: "", srcUrl: "http://testsuite/fire.oga", frameUrl: "", isEditable: false },
+      ];
+    }
+
+    function test_WebView_contextMenu_properties(data) {
+      invokeContextMenu(data.id);
+      var model = webView.currentContextMenu.contextModel;
+      compare(model.mediaType, data.mediaType);
+      compare(model.linkUrl, data.linkUrl);
+      compare(model.linkText, data.linkText);
+      compare(model.srcUrl, data.srcUrl);
+      if ((model.mediaType == WebView.MediaTypeImage) ||
+          (model.mediaType == WebView.MediaTypeCanvas)) {
+        verify(model.hasImageContents);
+      }
+      compare(model.frameUrl, data.frameUrl);
+      compare(model.isEditable, data.isEditable);
+    }
+
+    function test_WebView_contextMenu_saveLink() {
+      invokeContextMenu("hyperlink");
+      var model = webView.currentContextMenu.contextModel;
+      model.saveLink();
+      spy.wait();
+      compare(webView.downloadUrl, "http://testsuite/empty.html");
+      compare(webView.downloadReferrer,
+              "http://testsuite/tst_WebView_contextMenu.html");
+    }
+
+    function test_WebView_contextMenu_saveMedia_data() {
+      return [
+        { id: "image", url: "http://testsuite/cof.svg", referrer: "http://testsuite/tst_WebView_contextMenu.html" },
+        { id: "canvas", url: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAKElEQVQ4T2NkoDJgpLJ5DKMGUh6io2E4GoZkhMBosiEj0NC0jMAwBABIxgAVO+SUsAAAAABJRU5ErkJggg==", referrer: "" },
+        { id: "video", url: "http://testsuite/buddha.mp4", referrer: "http://testsuite/tst_WebView_contextMenu.html" },
+        { id: "audio", url: "http://testsuite/fire.oga", referrer: "http://testsuite/tst_WebView_contextMenu.html" },
+      ];
+    }
+
+    function test_WebView_contextMenu_saveMedia(data) {
+      invokeContextMenu(data.id);
+      var model = webView.currentContextMenu.contextModel;
+      model.saveMedia();
+      spy.wait();
+      compare(webView.downloadUrl, data.url);
+      compare(webView.downloadReferrer, data.referrer);
+    }
+
+    function test_WebView_contextMenu_editable() {
+      invokeContextMenu("editable");
+      var model = webView.currentContextMenu.contextModel;
+      compare(model.selectionText, "");
+      verify(!(model.editFlags & WebView.UndoCapability));
+      verify(!(model.editFlags & WebView.RedoCapability));
+      verify(!(model.editFlags & WebView.CutCapability));
+      verify(!(model.editFlags & WebView.CopyCapability));
+      verify(!(model.editFlags & WebView.EraseCapability));
+      verify(model.editFlags & WebView.SelectAllCapability);
+      webView.executeEditingCommand(WebView.EditingCommandSelectAll);
+      cleanup();
+
+      invokeContextMenu("editable");
+      model = webView.currentContextMenu.contextModel;
+      compare(model.selectionText, "text area");
+      verify(!(model.editFlags & WebView.UndoCapability));
+      verify(!(model.editFlags & WebView.RedoCapability));
+      verify(model.editFlags & WebView.CutCapability);
+      verify(model.editFlags & WebView.CopyCapability);
+      verify(model.editFlags & WebView.EraseCapability);
+      verify(model.editFlags & WebView.SelectAllCapability);
+      webView.executeEditingCommand(WebView.EditingCommandErase);
+      cleanup();
+      var r = webView.getTestApi().evaluateCode(
+          "document.querySelector(\"#editable\").value");
+      compare(r, "");
+
+      invokeContextMenu("editable");
+      model = webView.currentContextMenu.contextModel;
+      compare(model.selectionText, "");
+      verify(model.editFlags & WebView.UndoCapability);
+      verify(!(model.editFlags & WebView.RedoCapability));
+      webView.executeEditingCommand(WebView.EditingCommandUndo);
+      cleanup();
+      var r = webView.getTestApi().evaluateCode(
+          "document.querySelector(\"#editable\").value");
+      compare(r, "text area");
+
+      invokeContextMenu("editable");
+      model = webView.currentContextMenu.contextModel;
+      compare(model.selectionText, "text area");
+      verify(!(model.editFlags & WebView.UndoCapability));
+      verify(model.editFlags & WebView.RedoCapability);
+      webView.executeEditingCommand(WebView.EditingCommandRedo);
+      var r = webView.getTestApi().evaluateCode(
+          "document.querySelector(\"#editable\").value");
+      compare(r, "");
+
+      // TODO: once clipboard support is implemented
+      // (https://launchpad.net/bugs/1301419), test cut/copy/paste
+    }
+
+    function test_WebView_contextMenu_saveLink_saveMedia() {
+      invokeContextMenu("imagelink");
+      var model = webView.currentContextMenu.contextModel;
+
+      model.saveLink();
+      spy.wait();
+      compare(webView.downloadUrl, "http://testsuite/empty.html");
+      compare(webView.downloadReferrer,
+              "http://testsuite/tst_WebView_contextMenu.html");
+
+      model.saveMedia();
+      spy.wait();
+      compare(webView.downloadUrl, "http://testsuite/cof.svg");
+      compare(webView.downloadReferrer,
+              "http://testsuite/tst_WebView_contextMenu.html");
+    }
+
+    function test_WebView_contextMenu_mediaFlags_data() {
+      return [
+        { id: "video", loop: true, canSave: true, hasAudio: false, controls: false },
+        { id: "audio", loop: false, canSave: true, hasAudio: true, controls: true },
+      ];
+    }
+
+    function test_WebView_contextMenu_mediaFlags(data) {
+      invokeContextMenu(data.id);
+      var model = webView.currentContextMenu.contextModel;
+      compare(model.mediaFlags & WebView.MediaStatusLoop,
+              data.loop ? WebView.MediaStatusLoop : WebView.MediaStatusNone);
+      compare(model.mediaFlags & WebView.MediaStatusCanSave,
+              data.canSave ? WebView.MediaStatusCanSave : WebView.MediaStatusNone);
+      compare(model.mediaFlags & WebView.MediaStatusHasAudio,
+              data.hasAudio ? WebView.MediaStatusHasAudio : WebView.MediaStatusNone);
+      compare(model.mediaFlags & WebView.MediaStatusControls,
+              data.controls ? WebView.MediaStatusControls : WebView.MediaStatusNone);
+    }
+  }
+}

=== modified file 'shared/browser/oxide_web_contents_view.cc'
--- shared/browser/oxide_web_contents_view.cc	2015-02-24 20:27:57 +0000
+++ shared/browser/oxide_web_contents_view.cc	2015-05-26 19:54:24 +0000
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2013 Canonical Ltd.
+// Copyright (C) 2013-2015 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -137,6 +137,12 @@
 
 void WebContentsView::SetOverscrollControllerEnabled(bool enabled) {}
 
+void WebContentsView::ShowContextMenu(
+    content::RenderFrameHost* render_frame_host,
+    const content::ContextMenuParams& params) {
+  GetWebView()->ShowContextMenu(render_frame_host, params);
+}
+
 void WebContentsView::ShowPopupMenu(
     content::RenderFrameHost* render_frame_host,
     const gfx::Rect& bounds,

=== modified file 'shared/browser/oxide_web_contents_view.h'
--- shared/browser/oxide_web_contents_view.h	2014-11-04 23:00:07 +0000
+++ shared/browser/oxide_web_contents_view.h	2015-05-26 19:54:24 +0000
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2013 Canonical Ltd.
+// Copyright (C) 2013-2015 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -71,6 +71,8 @@
   void SetOverscrollControllerEnabled(bool enabled) final;
 
   // content::RenderViewHostDelegateView
+  void ShowContextMenu(content::RenderFrameHost* render_frame_host,
+                       const content::ContextMenuParams& params) final;
   void ShowPopupMenu(content::RenderFrameHost* render_frame_host,
                      const gfx::Rect& bounds,
                      int item_height,

=== added file 'shared/browser/oxide_web_context_menu.cc'
--- shared/browser/oxide_web_context_menu.cc	1970-01-01 00:00:00 +0000
+++ shared/browser/oxide_web_context_menu.cc	2015-05-26 19:54:24 +0000
@@ -0,0 +1,105 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2015 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_web_context_menu.h"
+
+#include "base/logging.h"
+#include "content/browser/frame_host/render_frame_host_impl.h"
+#include "content/public/browser/browser_context.h"
+#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/download_manager.h"
+#include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/render_view_host.h"
+#include "content/public/browser/web_contents.h"
+
+#include "oxide_web_contents_view.h"
+
+namespace {
+
+const GURL& GetDocumentURL(const content::ContextMenuParams& params) {
+  return params.frame_url.is_empty() ? params.page_url : params.frame_url;
+}
+
+content::Referrer CreateSaveAsReferrer(
+    const GURL& url,
+    const content::ContextMenuParams& params) {
+  const GURL& referring_url = GetDocumentURL(params);
+  return content::Referrer::SanitizeForRequest(
+      url,
+      content::Referrer(referring_url.GetAsReferrer(), params.referrer_policy));
+}
+
+} // namespace
+
+namespace oxide {
+
+void WebContextMenu::RenderFrameDeleted(content::RenderFrameHost* rfh) {
+  if (rfh != render_frame_host_) {
+    return;
+  }
+
+  Close();
+}
+
+void WebContextMenu::Hide() {}
+
+WebContextMenu::WebContextMenu(content::RenderFrameHost* rfh,
+                               const content::ContextMenuParams& params)
+    : content::WebContentsObserver(content::WebContents::FromRenderFrameHost(rfh)),
+      params_(params),
+      render_frame_host_(static_cast<content::RenderFrameHostImpl *>(rfh)) {}
+
+WebContextMenu::~WebContextMenu() {
+  DCHECK(!render_frame_host_);
+}
+
+void WebContextMenu::Close() {
+  Hide();
+  render_frame_host_ = nullptr;
+  content::BrowserThread::DeleteSoon(
+      content::BrowserThread::UI, FROM_HERE, this);
+}
+
+void WebContextMenu::SaveLink() const {
+  content::BrowserContext* context = web_contents()->GetBrowserContext();
+  content::DownloadManager* dlm =
+      content::BrowserContext::GetDownloadManager(context);
+  const GURL& url = params_.link_url;
+  scoped_ptr<content::DownloadUrlParameters> dl_params(
+      content::DownloadUrlParameters::FromWebContents(web_contents(), url));
+  dl_params->set_referrer(CreateSaveAsReferrer(url, params_));
+  dl_params->set_referrer_encoding(params_.frame_charset);
+  dl_params->set_suggested_name(params_.suggested_filename);
+  dl_params->set_prompt(true);
+  dlm->DownloadUrl(dl_params.Pass());
+}
+
+void WebContextMenu::SaveMedia() const {
+  bool is_large_data_url =
+      params_.has_image_contents && params_.src_url.is_empty();
+  if ((params_.media_type == blink::WebContextMenuData::MediaTypeCanvas) ||
+      ((params_.media_type == blink::WebContextMenuData::MediaTypeImage) &&
+          is_large_data_url)) {
+    render_frame_host_->GetRenderViewHost()->SaveImageAt(params_.x, params_.y);
+  } else {
+    const GURL& url = params_.src_url;
+    content::Referrer referrer = CreateSaveAsReferrer(url, params_);
+    web_contents()->SaveFrame(url, referrer);
+  }
+}
+
+} // namespace oxide

=== added file 'shared/browser/oxide_web_context_menu.h'
--- shared/browser/oxide_web_context_menu.h	1970-01-01 00:00:00 +0000
+++ shared/browser/oxide_web_context_menu.h	2015-05-26 19:54:24 +0000
@@ -0,0 +1,73 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2015 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_WEB_CONTEXT_MENU_H_
+#define _OXIDE_SHARED_BROWSER_WEB_CONTEXT_MENU_H_
+
+#include "base/macros.h"
+#include "base/memory/weak_ptr.h"
+#include "content/public/browser/web_contents_observer.h"
+#include "content/public/common/context_menu_params.h"
+
+class GURL;
+
+namespace base {
+template <typename T> class DeleteHelper;
+}
+
+namespace content {
+class ContextMenuParams;
+class RenderFrameHost;
+class RenderFrameHostImpl;
+}
+
+namespace gfx {
+class Rect;
+}
+
+namespace oxide {
+
+class WebContextMenu : public content::WebContentsObserver {
+ public:
+  virtual void Show() = 0;
+  void Close();
+
+ protected:
+  friend class base::DeleteHelper<WebContextMenu>;
+
+  WebContextMenu(content::RenderFrameHost* rfh,
+                 const content::ContextMenuParams& params);
+  virtual ~WebContextMenu();
+
+  content::ContextMenuParams params_;
+
+  void SaveLink() const;
+  void SaveMedia() const;
+
+ private:
+  void RenderFrameDeleted(content::RenderFrameHost* rfh) final;
+
+  virtual void Hide();
+
+  content::RenderFrameHostImpl* render_frame_host_;
+
+  DISALLOW_COPY_AND_ASSIGN(WebContextMenu);
+};
+
+} // namespace oxide
+
+#endif // _OXIDE_SHARED_BROWSER_WEB_CONTEXT_MENU_H_

=== modified file 'shared/browser/oxide_web_view.cc'
--- shared/browser/oxide_web_view.cc	2015-05-22 16:06:07 +0000
+++ shared/browser/oxide_web_view.cc	2015-05-26 19:54:24 +0000
@@ -86,6 +86,7 @@
 #include "oxide_render_widget_host_view.h"
 #include "oxide_web_contents_unloader.h"
 #include "oxide_web_contents_view.h"
+#include "oxide_web_context_menu.h"
 #include "oxide_web_frame.h"
 #include "oxide_web_popup_menu.h"
 #include "oxide_web_preferences.h"
@@ -1960,6 +1961,16 @@
   web_contents_->DispatchBeforeUnload(false);
 }
 
+void WebView::ShowContextMenu(content::RenderFrameHost* render_frame_host,
+                              const content::ContextMenuParams& params) {
+  WebContextMenu* menu = client_->CreateContextMenu(render_frame_host, params);
+  if (!menu) {
+    return;
+  }
+
+  menu->Show();
+}
+
 void WebView::ShowPopupMenu(content::RenderFrameHost* render_frame_host,
                             const gfx::Rect& bounds,
                             int selected_item,

=== modified file 'shared/browser/oxide_web_view.h'
--- shared/browser/oxide_web_view.h	2015-05-22 16:06:07 +0000
+++ shared/browser/oxide_web_view.h	2015-05-26 19:54:24 +0000
@@ -66,6 +66,7 @@
 
 namespace content {
 
+struct ContextMenuParams;
 struct MenuItem;
 class NativeWebKeyboardEvent;
 class NotificationRegistrar;
@@ -100,6 +101,7 @@
 class FilePicker;
 class JavaScriptDialog;
 class RenderWidgetHostView;
+class WebContextMenu;
 class WebFrame;
 class WebPopupMenu;
 class WebPreferences;
@@ -270,6 +272,8 @@
 
   void PrepareToClose();
 
+  void ShowContextMenu(content::RenderFrameHost* render_frame_host,
+                       const content::ContextMenuParams& params);
   void ShowPopupMenu(content::RenderFrameHost* render_frame_host,
                      const gfx::Rect& bounds,
                      int selected_item,

=== modified file 'shared/browser/oxide_web_view_client.cc'
--- shared/browser/oxide_web_view_client.cc	2015-05-22 16:06:07 +0000
+++ shared/browser/oxide_web_view_client.cc	2015-05-26 19:54:24 +0000
@@ -123,6 +123,12 @@
   return nullptr;
 }
 
+WebContextMenu* WebViewClient::CreateContextMenu(
+    content::RenderFrameHost* rfh,
+    const content::ContextMenuParams& params) {
+  return nullptr;
+}
+
 WebPopupMenu* WebViewClient::CreatePopupMenu(
     content::RenderFrameHost* rfh) {
   return nullptr;

=== modified file 'shared/browser/oxide_web_view_client.h'
--- shared/browser/oxide_web_view_client.h	2015-05-22 16:06:07 +0000
+++ shared/browser/oxide_web_view_client.h	2015-05-26 19:54:24 +0000
@@ -36,6 +36,7 @@
 }
 
 namespace content {
+struct ContextMenuParams;
 class NativeWebKeyboardEvent;
 class RenderFrameHost;
 class RenderViewHost;
@@ -50,6 +51,7 @@
 class MediaAccessPermissionRequest;
 class SecurityStatus;
 class SimplePermissionRequest;
+class WebContextMenu;
 class WebFrame;
 class WebPopupMenu;
 class WebView;
@@ -166,6 +168,10 @@
   virtual WebFrame* CreateWebFrame(
       content::RenderFrameHost* render_frame_host);
 
+  virtual WebContextMenu* CreateContextMenu(
+      content::RenderFrameHost* rfh,
+      const content::ContextMenuParams& params);
+
   virtual WebPopupMenu* CreatePopupMenu(content::RenderFrameHost* rfh);
 
   virtual WebView* CreateNewWebView(const gfx::Rect& initial_pos,

=== modified file 'shared/shared.gyp'
--- shared/shared.gyp	2015-05-21 21:01:36 +0000
+++ shared/shared.gyp	2015-05-26 19:54:24 +0000
@@ -387,6 +387,8 @@
         'browser/oxide_web_contents_unloader.h',
         'browser/oxide_web_contents_view.cc',
         'browser/oxide_web_contents_view.h',
+        'browser/oxide_web_context_menu.cc',
+        'browser/oxide_web_context_menu.h',
         'browser/oxide_web_frame.cc',
         'browser/oxide_web_frame.h',
         'browser/oxide_web_popup_menu.cc',