Merge ~santoshbit2007/oxide:UITK_FilePicker_Impl into oxide:master

[Santosh]

UITK filePicker Implementation which uses content-hub picker dialog.

I had issue with handing testcases for this, as no control over content-hub file selection view.
Suggestion is welcomed.

[Chris Coulson (chrisccoulson)]

Thanks for working on this.

First of all, don't be afraid to refactor existing code. It would be nice to refactor the FilePicker layering in a similar way to recent changes I've made to the context menu / popup menu / JS dialogs implementations.

I've left a few comments inline.

In addition to those:

- I don't see where the fallback (legacy / non content-hub) file picker implementation gets loaded.
- Please remove qt::WebViewProxyClient::CreateFilePicker (and the corresponding implementation in qt/quick/api).

I'm probably not the best person to review the content-hub picker implementation.

review: Needs Fixing

[Santosh (santoshbit2007)]

While running the testcases, I am seeing protobuf issue
-tmpdir /tmp/tmp-oxide-runtestsnIpqZ4 --file tst_WebViewFilePicker.qml'
[New Thread 0x7ffff539f700 (LWP 12033)]
Oxide.Ubuntu is an experimental module - future versions may change in backwards-incompatible ways, and without bumping the module version. Please use with caution

[libprotobuf FATAL ../../third_party/protobuf/src/google/protobuf/stubs/common.cc:78] This program was compiled against version 2.6.1 of the Protocol Buffer runtime library, which is not compatible with the installed version (3.0.0). Contact the program author for an update. If you compiled the program yourself, make sure that your headers are from the same version of Protocol Buffers as your link-time library. (Version verification failed in "/build/mir-sajBv9/mir-0.26.1+16.04.20170209.1/obj-x86_64-linux-gnu/src/protobuf/mir_protobuf.pb.cc".)

Its happens only when content-hub is used.

[Chris Coulson (chrisccoulson)]

Thanks, I've left some more comments.

Also, I've been gradually dropping the "oxide_" and "oxide_qt_" prefixes from filenames, keeping those only for files that implement Chromium interfaces

review: Needs Fixing

[Chris Coulson (chrisccoulson)]

I think this looks ok (please see 1 comment inline though).

Also, I think I have an alternative idea for how the fallback could work. I'll open another bug for that though.

review: Approve

[Chris Coulson (chrisccoulson)]

Ok, I opened bug 1672707 too

[Santosh (santoshbit2007)]

Thanks chris, I will check two new child bugs.

Regards
Santosh

On Tue, Mar 14, 2017 at 5:54 PM, Chris Coulson <email address hidden>
wrote:

> Ok, I opened bug 1672707 too
> --
> https://code.launchpad.net/~santoshbit2007/oxide/+git/oxide/+merge/317213
> You are the owner of ~santoshbit2007/oxide:UITK_FilePicker_Impl.
>

[Olivier Tilloy (osomon)]

Just tested with webbrowser-app unconfined on unity7 desktop, and while I’m getting the list of apps correctly displayed, clicking on any of them (including browser itself) does nothing and I’m seeing the following errors in the logs:

void ContentTransfer::setTransfer(com::ubuntu::content::Transfer*) No valid transfer object passed: QObject(0x0)
bool ContentTransfer::start() Transfer can't be started

Also, see two minor comments inline.

review: Needs Fixing

[Santosh (santoshbit2007)]

Thanks for comments.

I am aware of this issue, I think you are testing legacy webview filepicker and here webbrowser-app filepicker is used, anyway this issue is related with content-hub.
Basically what happens is deb package of source app are not correctly registered in
content-hub with unity7/desktop. Ken VanDine had same saying on this when I had asked.IIRC same issue happens with webbrowser-app without this patch.
I will do double check though.

Best way to validate with unity8/mobile platform and app having UbuntuWebView

I will check other comments.

[Olivier Tilloy (osomon)]

Nope, I am indeed testing the new webview (I have a branch of webbrowser-app that makes use of it). With the legacy webview (and webbrowser-app’s file picker), I am able to select a file from webbrowser-app itself as a source. With your branch, I can’t. It’s gotta work on desktop too, testing on mobile is not enough.

[Santosh (santoshbit2007)]

I tried to test with some apps(filemanager, gallary) but they doesn't seems to works well with content-hub, although gallery app works only once(needs reboot nexttime) and filepicker works well with that. There is some works going on ken team to fix that

unity7 result are as:

UbuntuWebView + oxidefilepicker
 gallary --> works
 webbrowser-app -- > doesn't ( need to fix in app side, as of now legacy webbrowser-app filepicker has code that shows the webbrowser-app local download page)
 This will not be valid in current case as now filepicker is app independent.

legacy webview + webbrowser-app filepicker : ->
gallary --. works
webbrowser-app --> works

[Santosh (santoshbit2007)]

Tested on unity8 with gallery app, works fine here

[Santosh (santoshbit2007)]

rebased on latest oxide

[Olivier Tilloy (osomon)]

Please see my comments inline.

I have tested with a custom branch of webbrowser-app that uses the new Oxide.Ubuntu WebView, on unity7 and unconfined.

The fallback to the file dialog works if qml-module-qtquick-dialogs is installed.

I can confirm that the content-hub dialog works well once with the gallery app as a provider, but it doesn’t work subsequent times.

I disagree that the custom code in webbrowser-app to show the downloads page is not a valid use-case. We can’t afford this kind of regression. Besides, it seems a perfectly valid use case for other apps that may want to provide an integrated content picker, not just webbrowser-app. I’d say we need an additional API that lets embedders provide a custom view for when the app itself is picked as a content provider.

We also might want to consider allowing embedders to override the built-in file picker. Apps might want to use the Oxide.Ubuntu WebView while retaining a tight control of what content can be uploaded.

review: Needs Fixing

[Santosh (santoshbit2007)]

Thanks olivier for reviews,

I agree with that disagree, may be I created confusion before but I also mean the same.
What I really mean is that "custom code in webbrowser-app to show the downloads" should be
in different place not in the webbrowser-app filepicker. so that when oxide's internal filepicker is used(in this case webbrowser-app filepicker is not used), showing of download page still happens.

Regarding overriding filepicker, Its minor work in term of coding because OxideUbuntuWebview directly drives from OxideQQuickWebView, so all the api exposed by OxideQQuickWebView are also valid for OxideUbuntuWebView, But there is difference in how ui_factroy has been used in both webview. OxideUbuntuWebView supports uitk factory and OxideQQuickWebView uses legacy_aux_factory.
uitk factory doesn't support overriding but legacy_aux_factory supports(as used by webrowser-app right now).
So Its basically design decision and would need to confirm with chris. If agreed I will prefer to take it in seperate patch.

1710134... by Santosh on 2017-03-29

Review comments addressed

[Olivier Tilloy (osomon)]

See answers inline.

48adfba... by Santosh on 2017-04-04

 test case updated

814695d... by Santosh on 2017-04-04

 Use compare in place of compare

[Olivier Tilloy (osomon)]

The updates to the test case look ok. I'd still like to see proper testing of the content-hub based picker with mocks of the content-hub D-Bus API, but it looks like you want to implement that in a follow-up branch?

[Santosh (santoshbit2007)]

Hi Olivier,

Yes, I am planning to work testing part in separate branch, Its not very
straight way I need to do dig down in D-bus usage and also
would need to update oxide testing infrastructure. there was some updates
that content-hub project also plan to add some testing support
capability (not exactly clear what their plan).
Existing branch is already big to handle for me, and I don't to complicate
it further and mess up things, and I also feel review will be easier
in separate branch.

I already filed a bug for testing improvement
https://bugs.launchpad.net/oxide/+bug/1679628
Sure will look into this next.

Regards
Santosh

On Tue, Apr 4, 2017 at 9:43 PM, Olivier Tilloy <<email address hidden>
> wrote:

> The updates to the test case look ok. I'd still like to see proper testing
> of the content-hub based picker with mocks of the content-hub D-Bus API,
> but it looks like you want to implement that in a follow-up branch?
> --
> https://code.launchpad.net/~santoshbit2007/oxide/+git/oxide/+merge/317213
> You are the owner of ~santoshbit2007/oxide:UITK_FilePicker_Impl.
>

Unmerged commits

814695d... by Santosh on 2017-04-04

 Use compare in place of compare

48adfba... by Santosh on 2017-04-04

 test case updated

1710134... by Santosh on 2017-03-29

Review comments addressed

6a80baf... by Santosh on 2017-02-27

UITK FilePicker implementation

diff --git a/qt/core/BUILD.gn b/qt/core/BUILD.gn
index 4a12427..395e906 100644
--- a/qt/core/BUILD.gn
+++ b/qt/core/BUILD.gn
@@ -199,6 +199,8 @@ source_set("core_sources") {
     "browser/clipboard/oxide_qt_clipboard.h",
     "browser/contents_view_impl.cc",
     "browser/contents_view_impl.h",
+    "browser/file_picker_host.cc",
+    "browser/file_picker_host.h",
     "browser/input/input_method_context_owner_client.h",
     "browser/input/qt_input_method_context.cc",
     "browser/input/qt_input_method_context.h",
@@ -224,8 +226,6 @@ source_set("core_sources") {
     "browser/oxide_qt_drag_utils.h",
     "browser/oxide_qt_event_utils.cc",
     "browser/oxide_qt_event_utils.h",
-    "browser/oxide_qt_file_picker.cc",
-    "browser/oxide_qt_file_picker.h",
     "browser/oxide_qt_find_controller.cc",
     "browser/oxide_qt_find_controller.h",
     "browser/oxide_qt_location_provider.cc",
@@ -284,6 +284,8 @@ source_set("core_sources") {
     "glue/contents_view.h",
     "glue/contents_view_client.h",
     "glue/edit_capability_flags.h",
+    "glue/file_picker.h",
+    "glue/file_picker_client.h",
     "glue/javascript_dialog.h",
     "glue/javascript_dialog_client.h",
     "glue/javascript_dialog_type.h",
@@ -296,8 +298,6 @@ source_set("core_sources") {
     "glue/navigation_history.cc",
     "glue/navigation_history.h",
     "glue/navigation_history_client.h",
-    "glue/oxide_qt_file_picker_proxy.h",
-    "glue/oxide_qt_file_picker_proxy_client.h",
     "glue/oxide_qt_init.cc",
     "glue/oxide_qt_init.h",
     "glue/oxide_qt_proxy_base.cc",
diff --git a/qt/core/browser/file_picker_host.cc b/qt/core/browser/file_picker_host.cc
new file mode 100644
index 0000000..8a35163
--- /dev/null
+++ b/qt/core/browser/file_picker_host.cc
@@ -0,0 +1,121 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2017 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 "file_picker_host.h"
+
+#include <vector>
+
+#include <QDir>
+#include <QFileInfo>
+#include <QString>
+#include <QStringList>
+#include <QtGlobal>
+
+#include "base/files/file_path.h"
+#include "base/strings/utf_string_conversions.h"
+#include "content/public/common/file_chooser_file_info.h"
+#include "content/public/common/file_chooser_params.h"
+
+#include "oxide/shared/browser/file_picker_client.h"
+
+#include "qt/core/glue/file_picker.h"
+
+namespace oxide {
+namespace qt {
+
+namespace {
+
+content::FileChooserFileInfo MakeFileInfo(const QFileInfo& fi) {
+  content::FileChooserFileInfo info;
+  info.file_path = base::FilePath(fi.absoluteFilePath().toStdString());
+  return info;
+}
+
+std::vector<content::FileChooserFileInfo> Enumerate(const QDir& dir) {
+  std::vector<content::FileChooserFileInfo> enumerated;
+  QDir::Filters filters =
+      QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot | QDir::Hidden;
+  for (const QFileInfo& file : dir.entryInfoList(filters)) {
+    if (file.isDir()) {
+      content::FileChooserFileInfo info;
+      QString directoryPath = file.absoluteFilePath() + QStringLiteral("/.");
+      info.file_path = base::FilePath(directoryPath.toStdString());
+      enumerated.push_back(info);
+      std::vector<content::FileChooserFileInfo> contents =
+          Enumerate(file.absoluteFilePath());
+      enumerated.insert(enumerated.end(), contents.begin(), contents.end());
+    } else {
+      enumerated.push_back(MakeFileInfo(file));
+    }
+  }
+  return enumerated;
+}
+
+}
+
+FilePickerHost::~FilePickerHost() = default;
+
+void FilePickerHost::Run() {
+  picker_->Show();
+}
+
+void FilePickerHost::Hide() {
+  picker_->Hide();
+}
+
+void FilePickerHost::done(const QFileInfoList& files,
+                          qt::FilePicker::Mode mode) {
+  std::vector<content::FileChooserFileInfo> selection;
+  if (mode == qt::FilePicker::UploadFolder) {
+    if (!files.isEmpty() && files.first().isDir()) {
+      // XXX: chrome does this asynchronously on a background thread
+      // (see net::DirectoryLister)
+      selection = Enumerate(files.first().absoluteFilePath());
+    }
+  } else {
+    for (const QFileInfo& file : files) {
+      selection.push_back(MakeFileInfo(file));
+    }
+  }
+  content::FileChooserParams::Mode permissions;
+  switch (mode) {
+    case qt::FilePicker::Open:
+      permissions = content::FileChooserParams::Open;
+      break;
+    case qt::FilePicker::OpenMultiple:
+      permissions = content::FileChooserParams::OpenMultiple;
+      break;
+    case qt::FilePicker::UploadFolder:
+      permissions = content::FileChooserParams::UploadFolder;
+      break;
+    case qt::FilePicker::Save:
+      permissions = content::FileChooserParams::Save;
+      break;
+  }
+
+  client_->Done(selection, permissions);
+}
+
+FilePickerHost::FilePickerHost(oxide::FilePickerClient* client)
+    : client_(client) {}
+
+void FilePickerHost::Init(std::unique_ptr<qt::FilePicker> picker) {
+  picker_ = std::move(picker);
+}
+
+} // namespace qt
+} // namespace oxide
diff --git a/qt/core/browser/file_picker_host.h b/qt/core/browser/file_picker_host.h
new file mode 100644
index 0000000..1248cc9
--- /dev/null
+++ b/qt/core/browser/file_picker_host.h
@@ -0,0 +1,61 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2017 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_FILE_PICKER_HOST_H_
+#define _OXIDE_QT_CORE_BROWSER_FILE_PICKER_HOST_H_
+
+#include <memory>
+
+#include "base/macros.h"
+
+#include "qt/core/glue/file_picker_client.h"
+#include "shared/browser/file_picker.h"
+
+namespace oxide {
+
+class FilePickerClient;
+
+namespace qt {
+
+class FilePicker;
+
+class FilePickerHost : public oxide::FilePicker, public FilePickerClient {
+ public:
+  FilePickerHost(oxide::FilePickerClient* client);
+  ~FilePickerHost() override;
+
+  void Init(std::unique_ptr<qt::FilePicker> picker);
+
+ private:
+  // oxide::FilePicker implementation
+  void Run() override;
+  void Hide() override;
+
+  // FilePickerClient implementation
+  void done(const QFileInfoList& files, qt::FilePicker::Mode mode) override;
+
+  std::unique_ptr<qt::FilePicker> picker_;
+
+  oxide::FilePickerClient* client_;
+
+  DISALLOW_COPY_AND_ASSIGN(FilePickerHost);
+};
+
+}  // namespace qt
+}  // namespace oxide
+
+#endif  // _OXIDE_QT_CORE_BROWSER_FILE_PICKER_HOST_H_
diff --git a/qt/core/browser/oxide_qt_file_picker.cc b/qt/core/browser/oxide_qt_file_picker.cc
deleted file mode 100644
index 691e1ff..0000000
--- a/qt/core/browser/oxide_qt_file_picker.cc
+++ /dev/null
@@ -1,145 +0,0 @@
-// 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_qt_file_picker.h"
-
-#include <vector>
-
-#include <QDir>
-#include <QFileInfo>
-#include <QString>
-#include <QStringList>
-#include <QtGlobal>
-
-#include "base/files/file_path.h"
-#include "base/strings/utf_string_conversions.h"
-#include "content/public/common/file_chooser_file_info.h"
-#include "content/public/common/file_chooser_params.h"
-
-#include "qt/core/glue/oxide_qt_file_picker_proxy.h"
-
-namespace oxide {
-namespace qt {
-
-namespace {
-
-content::FileChooserFileInfo MakeFileInfo(const QFileInfo& fi) {
-  content::FileChooserFileInfo info;
-  info.file_path = base::FilePath(fi.absoluteFilePath().toStdString());
-  return info;
-}
-
-std::vector<content::FileChooserFileInfo> Enumerate(const QDir& dir) {
-  std::vector<content::FileChooserFileInfo> enumerated;
-  QDir::Filters filters =
-      QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot | QDir::Hidden;
-  Q_FOREACH (const QFileInfo& file, dir.entryInfoList(filters)) {
-    if (file.isDir()) {
-      content::FileChooserFileInfo info;
-      QString directoryPath = file.absoluteFilePath() + QStringLiteral("/.");
-      info.file_path = base::FilePath(directoryPath.toStdString());
-      enumerated.push_back(info);
-      std::vector<content::FileChooserFileInfo> contents =
-          Enumerate(file.absoluteFilePath());
-      enumerated.insert(enumerated.end(), contents.begin(), contents.end());
-    } else {
-      enumerated.push_back(MakeFileInfo(file));
-    }
-  }
-  return enumerated;
-}
-
-}
-
-FilePicker::~FilePicker() {}
-
-void FilePicker::Run(const content::FileChooserParams& params) {
-  FilePickerProxy::Mode mode;
-  switch (params.mode) {
-    case content::FileChooserParams::Open:
-      mode = FilePickerProxy::Open;
-      break;
-    case content::FileChooserParams::OpenMultiple:
-      mode = FilePickerProxy::OpenMultiple;
-      break;
-    case content::FileChooserParams::UploadFolder:
-      mode = FilePickerProxy::UploadFolder;
-      break;
-    case content::FileChooserParams::Save:
-      mode = FilePickerProxy::Save;
-      break;
-    default:
-      Q_UNREACHABLE();
-  }
-  QString title = QString::fromStdString(base::UTF16ToUTF8(params.title));
-  QFileInfo defaultFileName(QString::fromStdString(params.default_file_name.value()));
-  QStringList acceptTypes;
-  std::vector<base::string16>::const_iterator i;
-  for (i = params.accept_types.begin(); i != params.accept_types.end(); ++i) {
-    acceptTypes << QString::fromStdString(base::UTF16ToUTF8(*i));
-  }
-  proxy_->Show(mode, title, defaultFileName, acceptTypes);
-}
-
-void FilePicker::Hide() {
-  proxy_->Hide();
-}
-
-void FilePicker::done(const QFileInfoList& files,
-                      FilePickerProxy::Mode mode) {
-  std::vector<content::FileChooserFileInfo> selection;
-  if (mode == FilePickerProxy::UploadFolder) {
-    if (!files.isEmpty() && files.first().isDir()) {
-      // XXX: chrome does this asynchronously on a background thread
-      // (see net::DirectoryLister)
-      selection = Enumerate(files.first().absoluteFilePath());
-    }
-  } else {
-    Q_FOREACH (const QFileInfo& file, files) {
-      selection.push_back(MakeFileInfo(file));
-    }
-  }
-  content::FileChooserParams::Mode permissions;
-  switch (mode) {
-    case FilePickerProxy::Open:
-      permissions = content::FileChooserParams::Open;
-      break;
-    case FilePickerProxy::OpenMultiple:
-      permissions = content::FileChooserParams::OpenMultiple;
-      break;
-    case FilePickerProxy::UploadFolder:
-      permissions = content::FileChooserParams::UploadFolder;
-      break;
-    case FilePickerProxy::Save:
-      permissions = content::FileChooserParams::Save;
-      break;
-    default:
-      Q_UNREACHABLE();
-  }
-
-  Done(selection, permissions);
-}
-
-FilePicker::FilePicker(content::RenderFrameHost* rfh)
-    : oxide::FilePicker(rfh) {}
-
-void FilePicker::SetProxy(FilePickerProxy* proxy) {
-  proxy_.reset(proxy);
-}
-
-} // namespace qt
-} // namespace oxide
diff --git a/qt/core/browser/oxide_qt_file_picker.h b/qt/core/browser/oxide_qt_file_picker.h
deleted file mode 100644
index 3141395..0000000
--- a/qt/core/browser/oxide_qt_file_picker.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// 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_BROWSER_FILE_PICKER_H_
-#define _OXIDE_QT_CORE_BROWSER_FILE_PICKER_H_
-
-#include <memory>
-
-#include "base/macros.h"
-
-#include "qt/core/glue/oxide_qt_file_picker_proxy_client.h"
-#include "shared/browser/oxide_file_picker.h"
-
-namespace oxide {
-namespace qt {
-
-class FilePickerProxy;
-
-class FilePicker : public oxide::FilePicker,
-                   public FilePickerProxyClient {
- public:
-  FilePicker(content::RenderFrameHost* rfh);
-
-  void SetProxy(FilePickerProxy* proxy);
-
- private:
-  ~FilePicker() override;
-
-  // oxide::FilePicker implementation
-  void Run(const content::FileChooserParams& params) override;
-  void Hide() override;
-
-  // FilePickerProxyClient implementation
-  void done(const QFileInfoList& files,
-            FilePickerProxy::Mode mode) override;
-
-  std::unique_ptr<FilePickerProxy> proxy_;
-
-  DISALLOW_IMPLICIT_CONSTRUCTORS(FilePicker);
-};
-
-} // namespace qt
-} // namespace oxide
-
-#endif // _OXIDE_QT_CORE_BROWSER_FILE_PICKER_H_
diff --git a/qt/core/browser/oxide_qt_web_view.cc b/qt/core/browser/oxide_qt_web_view.cc
index ab4d2d2..5c0fa3d 100644
--- a/qt/core/browser/oxide_qt_web_view.cc
+++ b/qt/core/browser/oxide_qt_web_view.cc
@@ -93,11 +93,11 @@
 #include "shared/common/oxide_enum_flags.h"
 
 #include "contents_view_impl.h"
+#include "file_picker_host.h"
 #include "javascript_dialog_host.h"
 #include "menu_item_builder.h"
 #include "oxide_qt_dpi_utils.h"
 #include "oxide_qt_event_utils.h"
-#include "oxide_qt_file_picker.h"
 #include "oxide_qt_screen_utils.h"
 #include "oxide_qt_script_message_handler.h"
 #include "oxide_qt_type_conversions.h"
@@ -543,10 +543,46 @@ void WebView::FrameMetadataUpdated(const cc::CompositorFrameMetadata& old) {
   client_->FrameMetadataUpdated(flags);
 }
 
-oxide::FilePicker* WebView::CreateFilePicker(content::RenderFrameHost* rfh) {
-  FilePicker* picker = new FilePicker(rfh);
-  picker->SetProxy(client_->CreateFilePicker(picker));
-  return picker;
+std::unique_ptr<oxide::FilePicker> WebView::CreateFilePicker(
+    const content::FileChooserParams& params,
+    oxide::FilePickerClient* client) {
+  std::unique_ptr<qt::FilePickerHost> host =
+      base::MakeUnique<qt::FilePickerHost>(client);
+
+  qt::FilePicker::Mode mode;
+  switch (params.mode) {
+    case content::FileChooserParams::Open:
+      mode = qt::FilePicker::Open;
+      break;
+    case content::FileChooserParams::OpenMultiple:
+      mode = qt::FilePicker::OpenMultiple;
+      break;
+    case content::FileChooserParams::UploadFolder:
+      mode = qt::FilePicker::UploadFolder;
+      break;
+    case content::FileChooserParams::Save:
+      mode = qt::FilePicker::Save;
+      break;
+  }
+
+  QString title = QString::fromStdString(base::UTF16ToUTF8(params.title));
+  QFileInfo default_file_name(
+      QString::fromStdString(params.default_file_name.value()));
+
+  QStringList accept_types;
+  for (const auto& i : params.accept_types) {
+    accept_types << QString::fromStdString(base::UTF16ToUTF8(i));
+  }
+
+  std::unique_ptr<qt::FilePicker> picker = aux_ui_factory_->CreateFilePicker(
+      mode, title, default_file_name, accept_types, host.get());
+
+  if (!picker) {
+    return nullptr;
+  }
+
+  host->Init(std::move(picker));
+  return std::move(host);
 }
 
 void WebView::ContentBlocked() {
diff --git a/qt/core/browser/oxide_qt_web_view.h b/qt/core/browser/oxide_qt_web_view.h
index 5da67af..6f8f670 100644
--- a/qt/core/browser/oxide_qt_web_view.h
+++ b/qt/core/browser/oxide_qt_web_view.h
@@ -125,7 +125,9 @@ class WebView : public oxide::WebViewClient,
                            int32_t line_no,
                            const base::string16& source_id) override;
   void FrameMetadataUpdated(const cc::CompositorFrameMetadata& old) override;
-  oxide::FilePicker* CreateFilePicker(content::RenderFrameHost* rfh) override;
+  std::unique_ptr<oxide::FilePicker> CreateFilePicker(
+      const content::FileChooserParams& params,
+      oxide::FilePickerClient* client) override;
   void ContentBlocked() override;
   void PrepareToCloseResponseReceived(bool proceed) override;
   void CloseRequested() override;
@@ -286,4 +288,4 @@ class WebView : public oxide::WebViewClient,
 } // namespace qt
 } // namespace oxide
 
-#endif // _OXIDE_QT_CORE_BROWSER_WEB_VIEW_H_
+#endif  // _OXIDE_QT_CORE_BROWSER_WEB_VIEW_H_
diff --git a/qt/core/glue/auxiliary_ui_factory.h b/qt/core/glue/auxiliary_ui_factory.h
index 4150b1b..c96f0b1 100644
--- a/qt/core/glue/auxiliary_ui_factory.h
+++ b/qt/core/glue/auxiliary_ui_factory.h
@@ -25,6 +25,7 @@
 
 #include "qt/core/glue/edit_capability_flags.h"
 #include "qt/core/glue/menu_item.h"
+#include "qt/core/glue/file_picker.h"
 
 QT_BEGIN_NAMESPACE
 class QString;
@@ -42,6 +43,8 @@ class TouchEditingMenuClient;
 class WebContextMenu;
 class WebContextMenuClient;
 struct WebContextMenuParams;
+class FilePickerClient;
+class FilePicker;
 
 class AuxiliaryUIFactory {
  public:
@@ -65,6 +68,13 @@ class AuxiliaryUIFactory {
   virtual std::unique_ptr<JavaScriptDialog> CreateBeforeUnloadDialog(
       const QUrl& origin_url,
       JavaScriptDialogClient* client) = 0;
+
+  virtual std::unique_ptr<FilePicker> CreateFilePicker(
+      qt::FilePicker::Mode mode,
+      const QString& title,
+      const QFileInfo& default_file,
+      const QStringList& accept_types,
+      FilePickerClient* client) = 0;
 };
 
 } // namespace qt
diff --git a/qt/core/glue/file_picker.h b/qt/core/glue/file_picker.h
new file mode 100644
index 0000000..de44ae6
--- /dev/null
+++ b/qt/core/glue/file_picker.h
@@ -0,0 +1,52 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// 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
+// 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_FILE_PICKER_H_
+#define _OXIDE_QT_CORE_GLUE_FILE_PICKER_H_
+
+#include <QtGlobal>
+
+QT_BEGIN_NAMESPACE
+class QFileInfo;
+class QString;
+class QStringList;
+QT_END_NAMESPACE
+
+namespace oxide {
+namespace qt {
+
+class FilePicker {
+ public:
+
+  // Matches chromium’s content/public/common/file_chooser_params.h
+  enum Mode {
+    Open,
+    OpenMultiple,
+    UploadFolder,
+    Save,
+  };
+
+  virtual ~FilePicker() = default;
+
+  virtual void Hide() = 0;
+  virtual void Show() = 0;
+};
+
+} // namespace qt
+} // namespace oxide
+
+#endif // _OXIDE_QT_CORE_GLUE_FILE_PICKER_H_
diff --git a/qt/core/glue/file_picker_client.h b/qt/core/glue/file_picker_client.h
new file mode 100644
index 0000000..222e266
--- /dev/null
+++ b/qt/core/glue/file_picker_client.h
@@ -0,0 +1,39 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// 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
+// 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_FILE_PICKER_CLIENT_H_
+#define _OXIDE_QT_CORE_GLUE_FILE_PICKER_CLIENT_H_
+
+#include <QFileInfoList>
+
+#include "file_picker.h"
+
+namespace oxide {
+namespace qt {
+
+class FilePickerClient {
+ public:
+  virtual ~FilePickerClient() = default;
+
+  virtual void done(const QFileInfoList& files,
+                    FilePicker::Mode mode) = 0;
+};
+
+} // namespace qt
+} // namespace oxide
+
+#endif // _OXIDE_QT_CORE_GLUE_FILE_PICKER_CLIENT_H_
diff --git a/qt/core/glue/oxide_qt_file_picker_proxy.h b/qt/core/glue/oxide_qt_file_picker_proxy.h
deleted file mode 100644
index 62d3def..0000000
--- a/qt/core/glue/oxide_qt_file_picker_proxy.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// vim:expandtab:shiftwidth=2:tabstop=2:
-// 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
-// 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_FILE_PICKER_PROXY_H_
-#define _OXIDE_QT_CORE_GLUE_FILE_PICKER_PROXY_H_
-
-#include <QtGlobal>
-
-QT_BEGIN_NAMESPACE
-class QFileInfo;
-class QString;
-class QStringList;
-QT_END_NAMESPACE
-
-namespace oxide {
-namespace qt {
-
-class FilePickerProxy {
- public:
-
-  // Matches chromium’s content/public/common/file_chooser_params.h
-  enum Mode {
-    Open,
-    OpenMultiple,
-    UploadFolder,
-    Save,
-  };
-
-  virtual ~FilePickerProxy() {}
-
-  virtual void Show(Mode mode,
-                    const QString& title,
-                    const QFileInfo& default_fileName,
-                    const QStringList& accept_types) = 0;
-
-  virtual void Hide() = 0;
-};
-
-} // namespace qt
-} // namespace oxide
-
-#endif // _OXIDE_QT_CORE_GLUE_FILE_PICKER_PROXY_H_
diff --git a/qt/core/glue/oxide_qt_file_picker_proxy_client.h b/qt/core/glue/oxide_qt_file_picker_proxy_client.h
deleted file mode 100644
index c1d6812..0000000
--- a/qt/core/glue/oxide_qt_file_picker_proxy_client.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// vim:expandtab:shiftwidth=2:tabstop=2:
-// 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
-// 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_FILE_PICKER_PROXY_CLIENT_H_
-#define _OXIDE_QT_CORE_GLUE_FILE_PICKER_PROXY_CLIENT_H_
-
-#include <QFileInfoList>
-
-#include "qt/core/glue/oxide_qt_file_picker_proxy.h"
-
-namespace oxide {
-namespace qt {
-
-class FilePickerProxyClient {
- public:
-  virtual ~FilePickerProxyClient() {}
-
-  virtual void done(const QFileInfoList& files,
-                    FilePickerProxy::Mode mode) = 0;
-};
-
-} // namespace qt
-} // namespace oxide
-
-#endif // _OXIDE_QT_CORE_GLUE_FILE_PICKER_PROXY_CLIENT_H_
diff --git a/qt/core/glue/oxide_qt_web_view_proxy_client.h b/qt/core/glue/oxide_qt_web_view_proxy_client.h
index 91105f8..21e85f7 100644
--- a/qt/core/glue/oxide_qt_web_view_proxy_client.h
+++ b/qt/core/glue/oxide_qt_web_view_proxy_client.h
@@ -46,8 +46,6 @@ QT_END_NAMESPACE
 namespace oxide {
 namespace qt {
 
-class FilePickerProxy;
-class FilePickerProxyClient;
 class LegacyExternalTouchEditingMenuControllerDelegate;
 class WebFrameProxy;
 
@@ -68,9 +66,6 @@ class WebViewProxyClient {
     return nullptr;
   }
 
-  // XXX: Move to AuxiliaryUIFactory
-  virtual FilePickerProxy* CreateFilePicker(FilePickerProxyClient* client) = 0;
-
   virtual void WebProcessStatusChanged() = 0;
 
   virtual void URLChanged() = 0;
diff --git a/qt/quick/CMakeLists.txt b/qt/quick/CMakeLists.txt
index 3737b68..621d2b1 100644
--- a/qt/quick/CMakeLists.txt
+++ b/qt/quick/CMakeLists.txt
@@ -38,7 +38,7 @@ set(OXIDE_QUICKLIB_SRCS
     contents_view.cc
     legacy_contents_view.cc
     oxide_qquick_accelerated_frame_node.cc
-    oxide_qquick_file_picker.cc
+    qquick_legacy_file_picker.cc
     oxide_qquick_image_frame_node.cc
     oxide_qquick_init.cc
     oxide_qquick_software_frame_node.cc
diff --git a/qt/quick/api/oxideqquickwebview.cc b/qt/quick/api/oxideqquickwebview.cc
index 1454418..842d917 100644
--- a/qt/quick/api/oxideqquickwebview.cc
+++ b/qt/quick/api/oxideqquickwebview.cc
@@ -52,7 +52,6 @@
 #include "qt/core/glue/macros.h"
 #include "qt/quick/contents_view.h"
 #include "qt/quick/legacy_contents_view.h"
-#include "qt/quick/oxide_qquick_file_picker.h"
 #include "qt/quick/oxide_qquick_init.h"
 #include "qt/quick/qquick_legacy_auxiliary_ui_factory.h"
 
@@ -138,7 +137,6 @@ OxideQQuickWebViewPrivate::OxideQQuickWebViewPrivate(
       navigation_history_(OxideQQuickNavigationHistoryPrivate::Create()),
       security_status_(OxideQSecurityStatusPrivate::Create()),
       find_controller_(OxideQFindControllerPrivate::Create()),
-      file_picker_(nullptr),
       using_old_load_event_signal_(false),
       construct_props_(new ConstructProps()) {}
 
@@ -153,13 +151,6 @@ OxideQQuickWebViewPrivate
       touch_selection_controller_.get());
 }
 
-oxide::qt::FilePickerProxy* OxideQQuickWebViewPrivate::CreateFilePicker(
-    oxide::qt::FilePickerProxyClient* client) {
-  Q_Q(OxideQQuickWebView);
-
-  return new oxide::qquick::FilePicker(q, client);
-}
-
 void OxideQQuickWebViewPrivate::WebProcessStatusChanged() {
   Q_Q(OxideQQuickWebView);
 
@@ -1986,17 +1977,28 @@ void OxideQQuickWebView::setBeforeUnloadDialog(
 QQmlComponent* OxideQQuickWebView::filePicker() const {
   Q_D(const OxideQQuickWebView);
 
-  return d->file_picker_;
+  if (!d->legacy_aux_ui_factory_) {
+    return nullptr;
+  }
+
+  return d->legacy_aux_ui_factory_->file_picker();
 }
 
-void OxideQQuickWebView::setFilePicker(QQmlComponent* filePicker) {
+void OxideQQuickWebView::setFilePicker(QQmlComponent* filepicker) {
   Q_D(OxideQQuickWebView);
 
-  if (d->file_picker_ == filePicker) {
+  if (!d->legacy_aux_ui_factory_) {
+    qWarning() <<
+        "OxideQQuickWebView: Specifying a filepicker implementation "
+        "has no effect on this WebView, as it provides a built-in file picker";
+    return;
+  }
+
+  if (d->legacy_aux_ui_factory_->file_picker() == filepicker) {
     return;
   }
 
-  d->file_picker_ = filePicker;
+  d->legacy_aux_ui_factory_->set_file_picker(filepicker);
   emit filePickerChanged();
 }
 
diff --git a/qt/quick/api/oxideqquickwebview_p.h b/qt/quick/api/oxideqquickwebview_p.h
index 14930de..a765f84 100644
--- a/qt/quick/api/oxideqquickwebview_p.h
+++ b/qt/quick/api/oxideqquickwebview_p.h
@@ -43,7 +43,6 @@ class OxideQQuickWebContextPrivate;
 class OxideQQuickWebView;
 
 QT_BEGIN_NAMESPACE
-class QQmlComponent;
 template <typename T> class QQmlListProperty;
 class QQuickItem;
 QT_END_NAMESPACE
@@ -81,8 +80,6 @@ class OXIDE_QTQUICK_EXPORT OxideQQuickWebViewPrivate
   // oxide::qt::WebViewProxyClient implementation
   oxide::qt::LegacyExternalTouchEditingMenuControllerDelegate*
   GetLegacyExternalTouchEditingMenuControllerDelegate() const override;
-  oxide::qt::FilePickerProxy* CreateFilePicker(
-      oxide::qt::FilePickerProxyClient* client) override;
   void WebProcessStatusChanged() override;
   void URLChanged() override;
   void TitleChanged() override;
@@ -162,8 +159,6 @@ class OXIDE_QTQUICK_EXPORT OxideQQuickWebViewPrivate
   std::unique_ptr<OxideQQuickTouchSelectionController>
       touch_selection_controller_;
 
-  QQmlComponent* file_picker_;
-
   bool using_old_load_event_signal_;
 
   struct ConstructProps;
diff --git a/qt/quick/oxide_qquick_file_picker.cc b/qt/quick/oxide_qquick_file_picker.cc
deleted file mode 100644
index ae8eaa5..0000000
--- a/qt/quick/oxide_qquick_file_picker.cc
+++ /dev/null
@@ -1,171 +0,0 @@
-// 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_qquick_file_picker.h"
-
-#include <QDebug>
-#include <QObject>
-#include <QQmlComponent>
-#include <QQmlContext>
-#include <QQmlEngine>
-#include <QQuickItem>
-
-#include "qt/core/glue/oxide_qt_file_picker_proxy_client.h"
-#include "qt/quick/api/oxideqquickwebview.h"
-#include "qt/quick/api/oxideqquickwebview_p.h"
-
-namespace oxide {
-namespace qquick {
-
-class FilePickerContext : public QObject {
-  Q_OBJECT
-  Q_PROPERTY(bool allowMultipleFiles READ allowMultipleFiles CONSTANT FINAL)
-  Q_PROPERTY(bool directory READ directory CONSTANT FINAL)
-  Q_PROPERTY(QString title READ title CONSTANT FINAL)
-  Q_PROPERTY(QString defaultFileName READ defaultFileName CONSTANT FINAL)
-  Q_PROPERTY(QStringList acceptTypes READ acceptTypes CONSTANT FINAL)
-
- public:
-  virtual ~FilePickerContext() {}
-  FilePickerContext(oxide::qt::FilePickerProxyClient* client,
-                    oxide::qt::FilePickerProxy::Mode mode,
-                    const QString& title,
-                    const QFileInfo& default_file_name,
-                    const QStringList& accept_types);
-
-  bool allowMultipleFiles() const;
-  bool directory() const;
-  const QString& title() const { return title_; }
-  const QString& defaultFileName() const { return default_file_name_; }
-  const QStringList& acceptTypes() const { return accept_types_; }
-
- public Q_SLOTS:
-  void accept(const QVariant& files) const;
-  void reject() const;
-
- private:
-  oxide::qt::FilePickerProxyClient* client_;
-  oxide::qt::FilePickerProxy::Mode mode_;
-  QString title_;
-  QString default_file_name_;
-  QStringList accept_types_;
-};
-
-FilePickerContext::FilePickerContext(
-    oxide::qt::FilePickerProxyClient* client,
-    oxide::qt::FilePickerProxy::Mode mode,
-    const QString& title,
-    const QFileInfo& default_file_name,
-    const QStringList& accept_types)
-    : client_(client),
-      mode_(mode),
-      title_(title),
-      default_file_name_(default_file_name.filePath()),
-      accept_types_(accept_types) {}
-
-bool FilePickerContext::allowMultipleFiles() const {
-  return (mode_ == oxide::qt::FilePickerProxy::OpenMultiple);
-}
-
-bool FilePickerContext::directory() const {
-  return (mode_ == oxide::qt::FilePickerProxy::UploadFolder);
-}
-
-void FilePickerContext::accept(const QVariant& files) const {
-  QFileInfoList info;
-  Q_FOREACH(const QString& file, files.toStringList()) {
-    if (QFileInfo::exists(file)) {
-      info.append(QFileInfo(file));
-    }
-  }
-  if ((info.size() > 1) && !allowMultipleFiles()) {
-    qWarning() <<
-        "FilePickerContext::accept: This file picker does not allow selecting "
-        "multiple files";
-    info.erase(info.begin() + 1, info.end());
-  }
-  client_->done(info, mode_);
-}
-
-void FilePickerContext::reject() const {
-  client_->done(QFileInfoList(), mode_);
-}
-
-FilePicker::~FilePicker() {}
-
-void FilePicker::Show(Mode mode,
-                      const QString& title,
-                      const QFileInfo& default_fileName,
-                      const QStringList& accept_types) {
-  if (!view_) {
-    qWarning() << "FilePicker::Show: Can't show after the view has gone";
-    client_->done(QFileInfoList(), mode);
-    return;
-  }
-
-  FilePickerContext* contextObject =
-      new FilePickerContext(client_, mode, title, default_fileName, accept_types);
-  QQmlComponent* component = view_->filePicker();
-  if (!component) {
-    qWarning() <<
-        "FilePicker::Show: Content requested a file picker, but the "
-        "application hasn't provided one";
-    delete contextObject;
-    client_->done(QFileInfoList(), mode);
-    return;
-  }
-
-  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() <<
-        "FilePicker::Show: Failed to create instance of Qml file picker "
-        "component";
-    context_.reset();
-    client_->done(QFileInfoList(), mode);
-    return;
-  }
-
-  OxideQQuickWebViewPrivate::get(view_)->addAttachedPropertyTo(item_.data());
-  item_->setParentItem(view_);
-  component->completeCreate();
-}
-
-void FilePicker::Hide() {
-  if (!item_.isNull()) {
-    item_->setVisible(false);
-  }
-}
-
-FilePicker::FilePicker(OxideQQuickWebView* view,
-                       oxide::qt::FilePickerProxyClient* client)
-    : view_(view),
-      client_(client) {}
-
-} // namespace qquick
-} // namespace oxide
-
-#include "oxide_qquick_file_picker.moc"
diff --git a/qt/quick/oxide_qquick_file_picker.h b/qt/quick/oxide_qquick_file_picker.h
deleted file mode 100644
index f988d8f..0000000
--- a/qt/quick/oxide_qquick_file_picker.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// 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_QUICK_FILE_PICKER_H_
-#define _OXIDE_QT_QUICK_FILE_PICKER_H_
-
-#include <QPointer>
-#include <QScopedPointer>
-#include <QtGlobal>
-
-#include "qt/core/glue/oxide_qt_file_picker_proxy.h"
-
-class OxideQQuickWebView;
-
-QT_BEGIN_NAMESPACE
-class QQmlContext;
-class QQuickItem;
-QT_END_NAMESPACE
-
-namespace oxide {
-
-namespace qt {
-class FilePickerProxyClient;
-}
-
-namespace qquick {
-
-class FilePicker : public oxide::qt::FilePickerProxy {
- public:
-  FilePicker(OxideQQuickWebView* view,
-             oxide::qt::FilePickerProxyClient* client);
-
- private:
-  ~FilePicker() override;
-
-  // oxide::qt::FilePickerProxy implementation
-  void Show(Mode mode,
-            const QString& title,
-            const QFileInfo& default_filename,
-            const QStringList& accept_types) override;
-  void Hide() override;
-
-  QPointer<OxideQQuickWebView> view_;
-  oxide::qt::FilePickerProxyClient* client_;
-  QScopedPointer<QQmlContext> context_;
-  QScopedPointer<QQuickItem> item_;
-};
-
-} // namespace qquick
-} // namespace oxide
-
-#endif // _OXIDE_QT_QUICK_FILE_PICKER_H_
diff --git a/qt/quick/qquick_legacy_auxiliary_ui_factory.cc b/qt/quick/qquick_legacy_auxiliary_ui_factory.cc
index c0084c2..a85eccb 100644
--- a/qt/quick/qquick_legacy_auxiliary_ui_factory.cc
+++ b/qt/quick/qquick_legacy_auxiliary_ui_factory.cc
@@ -13,7 +13,7 @@
 
 // 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
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
 #include "qquick_legacy_auxiliary_ui_factory.h"
 
@@ -25,6 +25,7 @@
 #include "qquick_legacy_alert_dialog.h"
 #include "qquick_legacy_before_unload_dialog.h"
 #include "qquick_legacy_confirm_dialog.h"
+#include "qquick_legacy_file_picker.h"
 #include "qquick_legacy_prompt_dialog.h"
 #include "qquick_legacy_web_context_menu.h"
 
@@ -103,10 +104,25 @@ LegacyAuxiliaryUIFactory::CreateBeforeUnloadDialog(
       new LegacyBeforeUnloadDialog(item_, before_unload_dialog_, client));
 }
 
+std::unique_ptr<qt::FilePicker> LegacyAuxiliaryUIFactory::CreateFilePicker(
+    qt::FilePicker::Mode mode,
+    const QString& title,
+    const QFileInfo& default_file_name,
+    const QStringList& accept_types,
+    qt::FilePickerClient* client) {
+  if (!file_picker_) {
+    return nullptr;
+  }
+
+  return std::unique_ptr<qt::FilePicker>(
+      new LegacyFilePicker(item_, file_picker_, mode, title, default_file_name,
+                           accept_types, client));
+}
+
 LegacyAuxiliaryUIFactory::LegacyAuxiliaryUIFactory(QQuickItem* item)
     : item_(item) {}
 
 LegacyAuxiliaryUIFactory::~LegacyAuxiliaryUIFactory() = default;
 
-} // namespace qquick
-} // namespace oxide
+}  // namespace qquick
+}  // namespace oxide
diff --git a/qt/quick/qquick_legacy_auxiliary_ui_factory.h b/qt/quick/qquick_legacy_auxiliary_ui_factory.h
index a7cec12..08421ed 100644
--- a/qt/quick/qquick_legacy_auxiliary_ui_factory.h
+++ b/qt/quick/qquick_legacy_auxiliary_ui_factory.h
@@ -53,6 +53,9 @@ class LegacyAuxiliaryUIFactory : public qt::AuxiliaryUIFactory {
   QQmlComponent* before_unload_dialog() const { return before_unload_dialog_; }
   void set_before_unload_dialog(QQmlComponent* c) { before_unload_dialog_ = c; }
 
+  QQmlComponent* file_picker() const { return file_picker_; }
+  void set_file_picker(QQmlComponent* c) { file_picker_ = c; }
+
  private:
   // qt::AuxiliaryUIFactory implementation
   std::unique_ptr<qt::WebContextMenu> CreateWebContextMenu(
@@ -71,6 +74,12 @@ class LegacyAuxiliaryUIFactory : public qt::AuxiliaryUIFactory {
   std::unique_ptr<qt::JavaScriptDialog> CreateBeforeUnloadDialog(
       const QUrl& origin_url,
       qt::JavaScriptDialogClient* client) override;
+  std::unique_ptr<qt::FilePicker> CreateFilePicker(
+      qt::FilePicker::Mode mode,
+      const QString& title,
+      const QFileInfo& default_file_name,
+      const QStringList& accept_types,
+      qt::FilePickerClient* client) override;
 
   QQuickItem* item_;
 
@@ -79,6 +88,7 @@ class LegacyAuxiliaryUIFactory : public qt::AuxiliaryUIFactory {
   QPointer<QQmlComponent> confirm_dialog_;
   QPointer<QQmlComponent> prompt_dialog_;
   QPointer<QQmlComponent> before_unload_dialog_;
+  QPointer<QQmlComponent> file_picker_;
 };
 
 } // namespace qquick
diff --git a/qt/quick/qquick_legacy_file_picker.cc b/qt/quick/qquick_legacy_file_picker.cc
new file mode 100644
index 0000000..cfe12ba
--- /dev/null
+++ b/qt/quick/qquick_legacy_file_picker.cc
@@ -0,0 +1,182 @@
+// 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 "qquick_legacy_file_picker.h"
+
+#include <QDebug>
+#include <QFileInfoList>
+#include <QObject>
+#include <QQmlComponent>
+#include <QQmlContext>
+#include <QQmlEngine>
+#include <QQuickItem>
+
+#include "qt/core/glue/file_picker_client.h"
+#include "qt/quick/api/oxideqquickwebview.h"
+#include "qt/quick/api/oxideqquickwebview_p.h"
+
+namespace oxide {
+namespace qquick {
+
+class FilePickerContext : public QObject {
+  Q_OBJECT
+  Q_PROPERTY(bool allowMultipleFiles READ allowMultipleFiles CONSTANT FINAL)
+  Q_PROPERTY(bool directory READ directory CONSTANT FINAL)
+  Q_PROPERTY(QString title READ title CONSTANT FINAL)
+  Q_PROPERTY(QString defaultFileName READ defaultFileName CONSTANT FINAL)
+  Q_PROPERTY(QStringList acceptTypes READ acceptTypes CONSTANT FINAL)
+
+ public:
+  virtual ~FilePickerContext() {}
+  FilePickerContext(oxide::qt::FilePickerClient* client,
+                    oxide::qt::FilePicker::Mode mode,
+                    const QString& title,
+                    const QFileInfo& default_file,
+                    const QStringList& accept_types);
+
+  bool allowMultipleFiles() const;
+  bool directory() const;
+  const QString& title() const { return title_; }
+  const QString& defaultFileName() const { return default_file_name_; }
+  const QStringList& acceptTypes() const { return accept_types_; }
+
+ public Q_SLOTS:
+  void accept(const QVariant& files) const;
+  void reject() const;
+
+ private:
+  oxide::qt::FilePickerClient* client_;
+  oxide::qt::FilePicker::Mode mode_;
+  QString title_;
+  QString default_file_name_;
+  QStringList accept_types_;
+};
+
+FilePickerContext::FilePickerContext(oxide::qt::FilePickerClient* client,
+                                     oxide::qt::FilePicker::Mode mode,
+                                     const QString& title,
+                                     const QFileInfo& default_file_name,
+                                     const QStringList& accept_types)
+    : client_(client),
+      mode_(mode),
+      title_(title),
+      default_file_name_(default_file_name.filePath()),
+      accept_types_(accept_types) {}
+
+bool FilePickerContext::allowMultipleFiles() const {
+  return (mode_ == oxide::qt::FilePicker::OpenMultiple);
+}
+
+bool FilePickerContext::directory() const {
+  return (mode_ == oxide::qt::FilePicker::UploadFolder);
+}
+
+void FilePickerContext::accept(const QVariant& files) const {
+  QFileInfoList info;
+  for (const QString& file : files.toStringList()) {
+    if (QFileInfo::exists(file)) {
+      info.append(QFileInfo(file));
+    }
+  }
+  if ((info.size() > 1) && !allowMultipleFiles()) {
+    qWarning() <<
+        "FilePickerContext::accept: This file picker does not allow selecting "
+        "multiple files";
+    info.erase(info.begin() + 1, info.end());
+  }
+  client_->done(info, mode_);
+}
+
+void FilePickerContext::reject() const {
+  client_->done(QFileInfoList(), mode_);
+}
+
+LegacyFilePicker::~LegacyFilePicker() {}
+
+void LegacyFilePicker::Show() {
+  if (!parent_) {
+    qWarning()
+        << "LegacyFilePicker::Show: Can't show after the parent has gone";
+    client_->done(QFileInfoList(), mode_);
+    return;
+  }
+
+  if (!component_) {
+    qWarning()
+        << "LegacyFilePicker::Show: Content requested a file picker, but the "
+           "application hasn't provided one";
+    client_->done(QFileInfoList(), mode_);
+    return;
+  }
+
+  FilePickerContext* contextObject = new FilePickerContext(
+      client_, mode_, title_, default_file_, accept_types_);
+
+  QQmlContext* baseContext = component_->creationContext();
+  if (!baseContext) {
+    baseContext = QQmlEngine::contextForObject(parent_);
+  }
+  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() <<
+        "LegacyFilePicker::Show: Failed to create instance of Qml file picker "
+        "component";
+    context_.reset();
+    client_->done(QFileInfoList(), mode_);
+    return;
+  }
+
+  OxideQQuickWebView* web_view = qobject_cast<OxideQQuickWebView*>(parent_);
+  if (web_view) {
+    OxideQQuickWebViewPrivate::get(web_view)
+        ->addAttachedPropertyTo(item_.data());
+  }
+  item_->setParentItem(parent_);
+  component_->completeCreate();
+}
+
+void LegacyFilePicker::Hide() {
+  if (!item_.isNull()) {
+    item_->setVisible(false);
+  }
+}
+
+LegacyFilePicker::LegacyFilePicker(QQuickItem* parent,
+                                   QQmlComponent* component,
+                                   qt::FilePicker::Mode mode,
+                                   const QString& title,
+                                   const QFileInfo& default_file,
+                                   const QStringList& accept_types,
+                                   qt::FilePickerClient* client)
+    : parent_(parent),
+      component_(component),
+      mode_(mode),
+      title_(title),
+      default_file_(default_file),
+      accept_types_(accept_types),
+      client_(client) {}
+
+} // namespace qquick
+} // namespace oxide
+
+#include "qquick_legacy_file_picker.moc"
diff --git a/qt/quick/qquick_legacy_file_picker.h b/qt/quick/qquick_legacy_file_picker.h
new file mode 100644
index 0000000..83bbd5c
--- /dev/null
+++ b/qt/quick/qquick_legacy_file_picker.h
@@ -0,0 +1,77 @@
+// 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_QUICK_LEGACY_FILE_PICKER_H_
+#define _OXIDE_QT_QUICK_LEGACY_FILE_PICKER_H_
+
+#include <QFileInfo>
+#include <QPointer>
+#include <QScopedPointer>
+#include <QStringList>
+#include <QtGlobal>
+
+#include "qt/core/glue/file_picker.h"
+
+class OxideQQuickWebView;
+
+QT_BEGIN_NAMESPACE
+class QQmlContext;
+class QQmlComponent;
+class QQuickItem;
+QT_END_NAMESPACE
+
+namespace oxide {
+
+namespace qt {
+class FilePickerClient;
+}
+
+namespace qquick {
+
+class LegacyFilePicker : public qt::FilePicker {
+ public:
+  LegacyFilePicker(QQuickItem* parent,
+                   QQmlComponent* component,
+                   qt::FilePicker::Mode mode,
+                   const QString& title,
+                   const QFileInfo&  default_file,
+                   const QStringList& accept_types,
+                   qt::FilePickerClient* client);
+
+ private:
+  ~LegacyFilePicker() override;
+
+  // oxide::qt::FilePicker implementation
+  void Show() override;
+  void Hide() override;
+
+  QPointer<QQuickItem> parent_;
+  QPointer<QQmlComponent> component_;
+  oxide::qt::FilePickerClient* client_;
+  QScopedPointer<QQmlContext> context_;
+  QScopedPointer<QQuickItem> item_;
+
+  qt::FilePicker::Mode mode_;
+  QString title_;
+  QFileInfo default_file_;
+  QStringList accept_types_;
+};
+
+}  // namespace qquick
+}  // namespace oxide
+
+#endif  // _OXIDE_QT_QUICK_LEGACY_FILE_PICKER_H_
diff --git a/qt/tests/qmltests/ubuntu_ui/tst_WebViewFilePicker.html b/qt/tests/qmltests/ubuntu_ui/tst_WebViewFilePicker.html
new file mode 100644
index 0000000..f0ae7ec
--- /dev/null
+++ b/qt/tests/qmltests/ubuntu_ui/tst_WebViewFilePicker.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <body>
+    <input id="input1" type="file">
+    <input id="input2" type="file" multiple>
+
+    <input id="input3" type="file" accept="image/*">
+    <input id="input4" type="file" accept="image/*,audio/*,video/*">
+  </body>
+</html>
+
diff --git a/qt/tests/qmltests/ubuntu_ui/tst_WebViewFilePicker.qml b/qt/tests/qmltests/ubuntu_ui/tst_WebViewFilePicker.qml
new file mode 100644
index 0000000..d30f798
--- /dev/null
+++ b/qt/tests/qmltests/ubuntu_ui/tst_WebViewFilePicker.qml
@@ -0,0 +1,58 @@
+import QtQuick 2.0
+import QtTest 1.0
+import com.canonical.Oxide 1.19
+import Oxide.Ubuntu 1.0
+import Oxide.testsupport 1.0
+import Ubuntu.Components 1.3
+
+UbuntuTestWebView {
+  id: webView
+  width: 800
+  height: 600
+
+  objectName: "webView"
+
+  TestCase {
+    id: test
+    name: "WebViewFilePicker"
+    when: windowShown
+
+    function getFilePicker() {
+      return TestSupport.findItemInScene(TestWindow.rootItem, "webView_WebFilePicker");
+    }
+
+    function waitForFilePicker() {
+      return TestUtils.waitFor(function() { return !!getFilePicker(); });
+    }
+
+    function closeFilePicker() {
+      return getFilePicker().accept([]);
+    }
+
+    function test_WebViewFilePicker1_launch_data() {
+       return [
+       {selector : "#input1", types : "", multiple : false},
+       {selector : "#input2", types : "", multiple : true},
+       {selector : "#input3", types : "image/*", multiple : false},
+       {selector : "#input4", types : "image/*,audio/*,video/*", multiple : false},
+     ]
+    }
+
+    // TODO : This just test the launch and close of filepicker since
+    // simulating complete file selection in content hub is not possible.
+    // So Need to boost the testcase with simulation of content-hub.
+    function test_WebViewFilePicker1_launch(data) {
+      webView.url = "http://testsuite/tst_WebViewFilePicker.html";
+      verify(webView.waitForLoadSucceeded());
+      var r = webView.getTestApi().getBoundingClientRectForSelector(data.selector);
+      mouseClick(webView, r.x + r.width / 2, r.y + r.height / 2);
+      verify(waitForFilePicker());
+
+      var pickerObject = getFilePicker();
+      compare(pickerObject.acceptTypes.toString(), data.types);
+      compare(pickerObject.allowMultiple, data.multiple);
+
+      closeFilePicker();
+    }
+  }
+}
diff --git a/qt/uitk/lib/CMakeLists.txt b/qt/uitk/lib/CMakeLists.txt
index 9e76ebe..d2e0234 100644
--- a/qt/uitk/lib/CMakeLists.txt
+++ b/qt/uitk/lib/CMakeLists.txt
@@ -27,6 +27,7 @@ set(OXIDE_UITKLIB_SRCS
     uitk_javascript_dialog.cc
     uitk_touch_editing_menu.cc
     uitk_touch_handle_drawable.cc
+    uitk_file_picker.cc
     uitk_web_context_menu.cc
     uitk_web_popup_menu.cc)
 
diff --git a/qt/uitk/lib/resources.qrc b/qt/uitk/lib/resources.qrc
index f2cf4ba..333b717 100644
--- a/qt/uitk/lib/resources.qrc
+++ b/qt/uitk/lib/resources.qrc
@@ -9,5 +9,7 @@
     <file alias="WebContextMenuMobile.qml">resources/WebContextMenuMobile.qml</file>
     <file alias="WebContextMenuDesktop.qml">resources/WebContextMenuDesktop.qml</file>
     <file alias="WebPopupMenu.qml">resources/WebPopupMenu.qml</file>
+    <file alias="FilePickerDialog.qml">resources/FilePickerDialog.qml</file>
+    <file alias="FilePickerContentHub.qml">resources/FilePickerContentHub.qml</file>
 </qresource>
 </RCC>
diff --git a/qt/uitk/lib/resources/FilePickerContentHub.qml b/qt/uitk/lib/resources/FilePickerContentHub.qml
new file mode 100644
index 0000000..f360d45
--- /dev/null
+++ b/qt/uitk/lib/resources/FilePickerContentHub.qml
@@ -0,0 +1,122 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2017 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
+
+import QtQuick 2.4
+import Ubuntu.Components.Popups 1.3 as Popups
+import Ubuntu.Content 1.3
+
+Popups.PopupBase {
+  id: picker
+  objectName: parent.objectName ? parent.objectName + "_WebFilePicker" : ""
+
+  property bool allowMultiple
+  property bool directory
+  property string title
+  property string defaultFileName
+  property var acceptTypes
+
+  property var activeContentTransfer
+
+  signal accept(var files)
+
+  Rectangle {
+    anchors.fill: parent
+
+    ContentPeerPicker {
+      id: peerPicker
+      anchors.fill: parent
+      contentType: ContentType.All
+      handler: ContentHandler.Source
+      headerText: picker.title
+      showTitle: true
+
+      onPeerSelected: {
+        if (picker.allowMultiple) {
+          peer.selectionType = ContentTransfer.Multiple;
+        } else {
+          peer.selectionType = ContentTransfer.Single;
+        }
+
+        picker.activeContentTransfer = peer.request();
+        transferConnection.target = picker.activeContentTransfer;
+      }
+
+      onCancelPressed: {
+        picker.accept([]);
+      }
+    }
+  }
+
+  Connections {
+    id: transferConnection
+    target: null
+    onStateChanged: {
+      if (picker.activeContentTransfer.state === ContentTransfer.Charged) {
+        var selectedItems = [];
+        for (var i in picker.activeContentTransfer.items) {
+          selectedItems.push(String(picker.activeContentTransfer.items[i].url)
+                                 .replace("file://", ""));
+        }
+        picker.accept(selectedItems);
+      }
+    }
+  }
+
+  function mimeTypeToContentType(mimeType) {
+    if (mimeType.search("image/") === 0) {
+      return ContentType.Pictures;
+    } else if (mimeType.search("audio/") === 0) {
+      return ContentType.Music;
+    } else if (mimeType.search("video/") === 0) {
+      return ContentType.Videos;
+    } else if (mimeType.search("text/x-vcard") === 0
+                 || mimeType.search("text/vcard") === 0) {
+      return ContentType.Contacts;
+    } else if (mimeType.search("application/epub[+]zip") === 0
+               || mimeType.search("application/vnd\.amazon\.ebook") === 0
+               || mimeType.search("application/x-mobipocket-ebook") === 0
+               || mimeType.search("application/x-fictionbook+xml") === 0
+               || mimeType.search("application/x-ms-reader") === 0) {
+      return ContentType.EBooks;
+    } else if (mimeType.search("text/") === 0
+               || mimeType.search("application/pdf") === 0
+               || mimeType.search("application/x-pdf") === 0
+               || mimeType.search("application/vnd\.pdf") === 0
+               || mimeType.search("application/vnd\.oasis\.opendocument") === 0
+               || mimeType.search("application/msword") === 0
+               || mimeType.search("application/vnd\.openxmlformats-officedocument\.wordprocessingml\.document") === 0
+               || mimeType.search("application/vnd\.openxmlformats-officedocument\.spreadsheetml\.sheet") === 0
+               || mimeType.search("application/vnd\.openxmlformats-officedocument\.presentationml\.presentation") === 0
+               || mimeType.search("application/vnd\.ms-excel") === 0
+               || mimeType.search("application/vnd\.ms-powerpoint") === 0) {
+      return ContentType.Documents;
+    } else {
+      return ContentType.Unknown;
+    }
+  }
+
+  Component.onCompleted: {
+    var contentType = ContentType.All
+    if (picker.acceptTypes.length === 1 && picker.acceptTypes[0].length != 0) {
+      contentType = mimeTypeToContentType(acceptTypes[0])
+      if (contentType == ContentType.Unknown) {
+        contentType = ContentType.All;
+      }
+    }
+    peerPicker.contentType = contentType;
+  }
+}
diff --git a/qt/uitk/lib/resources/FilePickerDialog.qml b/qt/uitk/lib/resources/FilePickerDialog.qml
new file mode 100644
index 0000000..7d780dc
--- /dev/null
+++ b/qt/uitk/lib/resources/FilePickerDialog.qml
@@ -0,0 +1,63 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2017 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
+
+import QtQuick 2.4
+import QtQuick.Dialogs 1.2
+
+FileDialog {
+  id: filePicker
+
+  property bool allowMultiple
+  property bool directory
+  property string defaultFileName
+  property var acceptTypes
+
+  signal accept(var files)
+
+  function show() {
+    filePicker.open();
+  }
+
+  function hide() {
+     filePicker.close();
+  }
+
+  selectExisting: true
+  selectFolder: directory
+  selectMultiple: allowMultiple && !directory
+  folder: defaultFileName
+  // TODO: Find correct mapping from mimetypes to namefilter.
+  // nameFilters does filtering of file based on file extension and
+  // no clear mapping available from mimetypes to file extension, so allow
+  // all files to avoid any inconsistency as of now.
+  nameFilters: ["All files (*)"]
+
+  sidebarVisible: true
+
+  onAccepted : {
+    var selectedFiles = [];
+    for (var i = 0; i < filePicker.fileUrls.length; ++i) {
+      selectedFiles.push(filePicker.fileUrls[i].replace("file://", ""));
+    }
+    filePicker.accept(selectedFiles);
+  }
+
+  onRejected: {
+    filePicker.accept([]);
+  }
+
+}
diff --git a/qt/uitk/lib/uitk_auxiliary_ui_factory.cc b/qt/uitk/lib/uitk_auxiliary_ui_factory.cc
index e6f64fb..7483f28 100644
--- a/qt/uitk/lib/uitk_auxiliary_ui_factory.cc
+++ b/qt/uitk/lib/uitk_auxiliary_ui_factory.cc
@@ -36,6 +36,7 @@
 #include "qt/uitk/lib/api/oxideubuntuwebcontextmenuitem_p.h"
 
 #include "uitk_before_unload_dialog.h"
+#include "uitk_file_picker.h"
 #include "uitk_javascript_dialog.h"
 #include "uitk_touch_editing_menu.h"
 #include "uitk_web_context_menu.h"
@@ -257,6 +258,16 @@ AuxiliaryUIFactory::CreateBeforeUnloadDialog(
   return BeforeUnloadDialog::Create(item_, client);
 }
 
+std::unique_ptr<qt::FilePicker> AuxiliaryUIFactory::CreateFilePicker(
+    qt::FilePicker::Mode mode,
+    const QString& title,
+    const QFileInfo& default_file,
+    const QStringList& accept_types,
+    qt::FilePickerClient* client) {
+  return FilePicker::Create(item_, mode, title, default_file, accept_types,
+                            client);
+}
+
 AuxiliaryUIFactory::AuxiliaryUIFactory(QQuickItem* item, Delegate* delegate)
     : item_(item),
       delegate_(delegate) {
diff --git a/qt/uitk/lib/uitk_auxiliary_ui_factory.h b/qt/uitk/lib/uitk_auxiliary_ui_factory.h
index 3d169e4..6be5856 100644
--- a/qt/uitk/lib/uitk_auxiliary_ui_factory.h
+++ b/qt/uitk/lib/uitk_auxiliary_ui_factory.h
@@ -68,6 +68,12 @@ class AuxiliaryUIFactory : public qt::AuxiliaryUIFactory {
   std::unique_ptr<qt::JavaScriptDialog> CreateBeforeUnloadDialog(
       const QUrl& origin_url,
       qt::JavaScriptDialogClient* client) override;
+  std::unique_ptr<qt::FilePicker> CreateFilePicker(
+      qt::FilePicker::Mode mode,
+      const QString& title,
+      const QFileInfo& defaultFileName,
+      const QStringList& acceptTypes,
+      qt::FilePickerClient* client) override;
 
   QQuickItem* item_;
 
diff --git a/qt/uitk/lib/uitk_file_picker.cc b/qt/uitk/lib/uitk_file_picker.cc
new file mode 100644
index 0000000..ef2caa1
--- /dev/null
+++ b/qt/uitk/lib/uitk_file_picker.cc
@@ -0,0 +1,150 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2017 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 "uitk_file_picker.h"
+
+#include <QDebug>
+#include <QLatin1String>
+#include <QObject>
+#include <QQmlComponent>
+#include <QQmlContext>
+#include <QQmlEngine>
+#include <QQuickItem>
+#include <QString>
+#include <QStringList>
+
+#include "qt/core/glue/file_picker_client.h"
+
+namespace oxide {
+
+namespace uitk {
+
+FilePicker::FilePicker(qt::FilePickerClient* client, qt::FilePicker::Mode mode)
+    : client_(client), mode_(mode) {}
+
+FilePicker::~FilePicker() = default;
+
+std::unique_ptr<FilePicker> FilePicker::Create(QQuickItem* parent,
+                                               qt::FilePicker::Mode mode,
+                                               const QString& title,
+                                               const QFileInfo& default_file,
+                                               const QStringList& accept_types,
+                                               qt::FilePickerClient* client) {
+  Q_ASSERT(parent);
+  std::unique_ptr<FilePicker> picker(new FilePicker(client, mode));
+  if (!picker->Init(parent, mode, title, default_file, accept_types)) {
+    return nullptr;
+  }
+  return picker;
+}
+
+bool FilePicker::Init(QQuickItem* parent,
+                      qt::FilePicker::Mode mode,
+                      const QString& title,
+                      const QFileInfo& default_file,
+                      const QStringList& accept_types) {
+  QQmlEngine* engine = qmlEngine(parent);
+  if (!engine) {
+    qWarning() << "uitk::FilePicker: Failed to show filepicker - "
+                  "cannot determine qml engine for parent item";
+    return false;
+  }
+
+  bool fallback = false;
+  std::unique_ptr<QQmlComponent> component(new QQmlComponent(engine));
+  component->loadUrl(QUrl("qrc:///FilePickerContentHub.qml"),
+                     QQmlComponent::PreferSynchronous);
+  if (component->isError()) {
+    qDebug() << "uitk::FilePicker: content hub filepicker failed so fallback "
+                "to Quick FileDialog";
+    component.reset(new QQmlComponent(engine));
+    component->loadUrl(QUrl("qrc:///FilePickerDialog.qml"));
+    fallback = true;
+  }
+
+  if (component->isError()) {
+    qCritical()
+        << "uitk::FilePicker: Failed to Initialize filepicker component "
+           "because of following error";
+    for (const auto& error : component->errors()) {
+      qCritical() << error.description();
+    }
+    return false;
+  }
+
+  Q_ASSERT(component->isReady());
+
+  QObject* picker = component->beginCreate(engine->rootContext());
+
+  if (!picker) {
+    qCritical() << "uitk::FilePicker: Failed to create File picker instance";
+    return false;
+  }
+
+  item_.reset(picker);
+
+  // Default filepicker based on content hub is QuickItem but fallback file
+  // picker may not be QQuickItem, depending upon how QFileDialog is implemented
+  // internally
+  if (!fallback) {
+    QQuickItem* quick_item = qobject_cast<QQuickItem*>(picker);
+    if (!quick_item) {
+      qCritical()
+          << "uitk::FilePicker: File Picker instance is not a QQuickItem";
+      return false;
+    }
+    quick_item->setParentItem(parent);
+  }
+
+  bool multiple = mode == qt::FilePicker::OpenMultiple;
+  bool directory = mode == qt::FilePicker::UploadFolder;
+  item_->setProperty("allowMultiple", multiple);
+  item_->setProperty("directory", directory);
+  item_->setProperty("title", title);
+  item_->setProperty("defaultFileName", default_file.absoluteFilePath());
+  item_->setProperty("acceptTypes", accept_types);
+
+  component->completeCreate();
+
+  connect(item_.get(), SIGNAL(accept(const QVariant&)), this,
+          SLOT(OnAccept(const QVariant&)));
+
+  return true;
+}
+
+void FilePicker::OnAccept(const QVariant& files) const {
+  QFileInfoList info;
+  for (const QString& file : files.toStringList()) {
+    if (QFileInfo::exists(file)) {
+      info.append(QFileInfo(file));
+    }
+  }
+  client_->done(info, mode_);
+}
+
+void FilePicker::Hide() {
+  QMetaObject::invokeMethod(item_.get(), "hide");
+}
+
+void FilePicker::Show() {
+  QMetaObject::invokeMethod(item_.get(), "show");
+}
+
+}  // uitk
+}  // oxide
+
+#include "uitk_file_picker.moc"
diff --git a/qt/uitk/lib/uitk_file_picker.h b/qt/uitk/lib/uitk_file_picker.h
new file mode 100644
index 0000000..c30526c
--- /dev/null
+++ b/qt/uitk/lib/uitk_file_picker.h
@@ -0,0 +1,80 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2017 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_UITK_LIB_FILE_PICKER_H_
+#define _OXIDE_QT_UITK_LIB_FILE_PICKER_H_
+
+#include <memory>
+#include <QObject>
+
+#include "qt/core/glue/file_picker.h"
+
+QT_BEGIN_NAMESPACE
+class QFileInfo;
+class QQuickItem;
+class QString;
+class QStringList;
+QT_END_NAMESPACE
+
+namespace oxide {
+
+namespace qt {
+class FilePickerClient;
+}
+
+namespace uitk {
+
+class FilePicker : public QObject, public qt::FilePicker {
+  Q_OBJECT
+
+ public:
+  static std::unique_ptr<FilePicker> Create(QQuickItem* item,
+                                            qt::FilePicker::Mode mode,
+                                            const QString& title,
+                                            const QFileInfo& default_file,
+                                            const QStringList& accept_types,
+                                            qt::FilePickerClient* client);
+
+  ~FilePicker() override;
+
+ private Q_SLOTS:
+  void OnAccept(const QVariant& files) const;
+
+ private:
+  FilePicker(qt::FilePickerClient* client, qt::FilePicker::Mode mode);
+
+  bool Init(QQuickItem* item,
+            qt::FilePicker::Mode mode,
+            const QString& title,
+            const QFileInfo& default_file,
+            const QStringList& accept_types);
+
+  // oxide::qt::FilePicker implementation
+  void Show() override;
+  void Hide() override;
+
+  qt::FilePicker::Mode mode_;
+  qt::FilePickerClient* client_;
+  std::unique_ptr<QObject> item_;
+
+  Q_DISABLE_COPY(FilePicker)
+};
+
+}  // uitk
+}  // oxide
+
+#endif  // _OXIDE_QT_UITK_LIB_FILE_PICKER_H_
diff --git a/shared/BUILD.gn b/shared/BUILD.gn
index 77eaeca..55eabf6 100644
--- a/shared/BUILD.gn
+++ b/shared/BUILD.gn
@@ -299,6 +299,10 @@ component("shared") {
     "browser/device/power_save_blocker.h",
     "browser/device/power_save_blocker_linux.cc",
     "browser/display_form_factor.h",
+    "browser/file_picker_host.cc",
+    "browser/file_picker_host.h",
+    "browser/file_picker.h",
+    "browser/file_picker_client.h",
     "browser/input/input_method_context.h",
     "browser/input/input_method_context_client.cc",
     "browser/input/input_method_context_client.h",
@@ -361,8 +365,6 @@ component("shared") {
     "browser/oxide_event_utils.h",
     "browser/oxide_favicon_helper.cc",
     "browser/oxide_favicon_helper.h",
-    "browser/oxide_file_picker.cc",
-    "browser/oxide_file_picker.h",
     "browser/oxide_find_controller.cc",
     "browser/oxide_find_controller.h",
     "browser/oxide_find_controller_client.h",
diff --git a/shared/browser/file_picker.h b/shared/browser/file_picker.h
new file mode 100644
index 0000000..d0db237
--- /dev/null
+++ b/shared/browser/file_picker.h
@@ -0,0 +1,37 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2013-2016 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_FILE_PICKER_H_
+#define _OXIDE_SHARED_BROWSER_FILE_PICKER_H_
+
+namespace content {
+class FileChooserParams;
+}
+
+namespace oxide {
+
+class FilePicker {
+ public:
+  virtual ~FilePicker() = default;
+
+  virtual void Run() = 0;
+  virtual void Hide() = 0;
+};
+
+}  // oxide
+
+#endif  // _OXIDE_SHARED_BROWSER_FILE_PICKER_H_
diff --git a/shared/browser/file_picker_client.h b/shared/browser/file_picker_client.h
new file mode 100644
index 0000000..f99de98
--- /dev/null
+++ b/shared/browser/file_picker_client.h
@@ -0,0 +1,39 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2013-2016 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_FILE_PICKER_CLIENT_H_
+#define _OXIDE_SHARED_BROWSER_FILE_PICKER_CLIENT_H_
+
+#include <vector>
+
+namespace content {
+struct FileChooserFileInfo;
+struct FileChooserParams;
+}
+
+namespace oxide {
+
+class FilePickerClient {
+ public:
+  virtual ~FilePickerClient() = default;
+  virtual void Done(const std::vector<content::FileChooserFileInfo>& files,
+                    content::FileChooserParams::Mode permissions) = 0;
+};
+
+}  // oxide
+
+#endif  // _OXIDE_SHARED_BROWSER_FILE_PICKER_CLIENT_H_
diff --git a/shared/browser/file_picker_host.cc b/shared/browser/file_picker_host.cc
new file mode 100644
index 0000000..1699d82
--- /dev/null
+++ b/shared/browser/file_picker_host.cc
@@ -0,0 +1,92 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// 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
+// 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 "file_picker_host.h"
+
+#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/web_contents.h"
+#include "content/public/common/file_chooser_file_info.h"
+
+#include "oxide/shared/browser/file_picker.h"
+#include "oxide/shared/browser/web_contents_client.h"
+#include "shared/browser/web_contents_helper.h"
+
+namespace oxide {
+
+FilePickerHost::FilePickerHost(content::RenderFrameHost* rfh,
+                               const content::FileChooserParams& params,
+                               const base::Closure& on_close_cb)
+    : content::WebContentsObserver(
+          content::WebContents::FromRenderFrameHost(rfh)),
+      render_frame_host_(rfh),
+      params_(params),
+      on_close_cb_(on_close_cb) {
+  DCHECK(web_contents());
+
+  WebContentsHelper* helper =
+      WebContentsHelper::FromWebContents(web_contents());
+  if (!helper->client()) {
+    return;
+  }
+
+  file_picker_ = helper->client()->CreateFilePicker(params_, this);
+}
+
+FilePickerHost::~FilePickerHost() = default;
+
+void FilePickerHost::Close() {
+  if (on_close_cb_.is_null()) {
+    return;
+  }
+
+  base::Closure on_close_callback = std::move(on_close_cb_);
+
+  if (file_picker_) {
+    file_picker_->Hide();
+  }
+  on_close_callback.Run();
+}
+
+void FilePickerHost::RenderFrameDeleted(content::RenderFrameHost* rfh) {
+  if (rfh != render_frame_host_) {
+    return;
+  }
+  render_frame_host_ = nullptr;
+
+  if (file_picker_) {
+    file_picker_->Hide();
+  }
+}
+
+void FilePickerHost::Done(
+    const std::vector<content::FileChooserFileInfo>& files,
+    content::FileChooserParams::Mode permissions) {
+  render_frame_host_->FilesSelectedInChooser(files, permissions);
+  render_frame_host_ = nullptr;
+  Close();
+}
+
+void FilePickerHost::Run() {
+  if (!file_picker_) {
+    return;
+  }
+
+  file_picker_->Run();
+}
+
+}  // namespace oxide
diff --git a/shared/browser/file_picker_host.h b/shared/browser/file_picker_host.h
new file mode 100644
index 0000000..9ac304f
--- /dev/null
+++ b/shared/browser/file_picker_host.h
@@ -0,0 +1,69 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2017 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_FILE_PICKER_HOST_H_
+#define _OXIDE_SHARED_BROWSER_FILE_PICKER_HOST_H_
+
+#include <memory>
+#include <vector>
+
+#include "base/callback.h"
+#include "base/macros.h"
+#include "content/public/browser/web_contents_observer.h"
+#include "content/public/common/file_chooser_params.h"
+
+#include "shared/browser/file_picker_client.h"
+
+namespace content {
+class RenderFrameHost;
+}
+
+namespace oxide {
+class FilePicker;
+
+class FilePickerHost : public FilePickerClient,
+                       public content::WebContentsObserver {
+ public:
+  FilePickerHost(content::RenderFrameHost* rfh,
+                 const content::FileChooserParams& params,
+                 const base::Closure& on_close_cb);
+  ~FilePickerHost() override;
+
+  void Run();
+
+ private:
+  void Close();
+
+  // oxide::FilePickerClient Implemntation
+  void Done(const std::vector<content::FileChooserFileInfo>& files,
+            content::FileChooserParams::Mode permissions) override;
+
+  // content::WebContentsObserver implementation
+  void RenderFrameDeleted(content::RenderFrameHost* rfh) override;
+
+  content::RenderFrameHost* render_frame_host_;
+  content::FileChooserParams params_;
+  base::Closure on_close_cb_;
+
+  std::unique_ptr<FilePicker> file_picker_;
+
+  DISALLOW_COPY_AND_ASSIGN(FilePickerHost);
+};
+
+}  // namespace oxide
+
+#endif  // _OXIDE_SHARED_BROWSER_FILE_PICKER_HOST_H_
diff --git a/shared/browser/oxide_file_picker.cc b/shared/browser/oxide_file_picker.cc
deleted file mode 100644
index 1bb4d77..0000000
--- a/shared/browser/oxide_file_picker.cc
+++ /dev/null
@@ -1,57 +0,0 @@
-// vim:expandtab:shiftwidth=2:tabstop=2:
-// 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
-// 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_file_picker.h"
-
-#include "base/logging.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/render_frame_host.h"
-#include "content/public/browser/web_contents.h"
-#include "content/public/common/file_chooser_file_info.h"
-
-namespace oxide {
-
-FilePicker::FilePicker(content::RenderFrameHost* rfh)
-    : content::WebContentsObserver(content::WebContents::FromRenderFrameHost(rfh)),
-      render_frame_host_(rfh) {}
-
-FilePicker::~FilePicker() {
-  DCHECK(!render_frame_host_);
-}
-
-void FilePicker::RenderFrameDeleted(content::RenderFrameHost* rfh) {
-  if (rfh != render_frame_host_) {
-    return;
-  }
-  render_frame_host_ = nullptr;
-  Hide();
-  content::BrowserThread::DeleteSoon(
-      content::BrowserThread::UI, FROM_HERE, this);
-}
-
-void FilePicker::Hide() {}
-
-void FilePicker::Done(const std::vector<content::FileChooserFileInfo>& files,
-                      content::FileChooserParams::Mode permissions) {
-  render_frame_host_->FilesSelectedInChooser(files, permissions);
-  render_frame_host_ = nullptr;
-  Hide();
-  content::BrowserThread::DeleteSoon(
-      content::BrowserThread::UI, FROM_HERE, this);
-}
-
-} // namespace oxide
diff --git a/shared/browser/oxide_file_picker.h b/shared/browser/oxide_file_picker.h
deleted file mode 100644
index b0136c6..0000000
--- a/shared/browser/oxide_file_picker.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// 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_FILE_PICKER_H_
-#define _OXIDE_SHARED_BROWSER_FILE_PICKER_H_
-
-#include <vector>
-
-#include "base/macros.h"
-#include "content/public/browser/web_contents_observer.h"
-#include "content/public/common/file_chooser_params.h"
-
-#include "shared/common/oxide_shared_export.h"
-
-namespace base {
-template <typename T> class DeleteHelper;
-}
-
-namespace content {
-class RenderFrameHost;
-struct FileChooserFileInfo;
-struct FileChooserParams;
-}
-
-namespace oxide {
-
-class OXIDE_SHARED_EXPORT FilePicker : public content::WebContentsObserver {
- public:
-  virtual void Run(const content::FileChooserParams& params) = 0;
-
-  void Done(const std::vector<content::FileChooserFileInfo>& files,
-            content::FileChooserParams::Mode permissions);
-
- protected:
-  friend class base::DeleteHelper<FilePicker>;
-
-  FilePicker(content::RenderFrameHost* rfh);
-  virtual ~FilePicker();
-
- private:
-  virtual void Hide();
-
-  // content::WebContentsObserver implementation
-  void RenderFrameDeleted(content::RenderFrameHost* rfh) override;
-
-  content::RenderFrameHost* render_frame_host_;
-
-  DISALLOW_COPY_AND_ASSIGN(FilePicker);
-};
-
-} // namespace oxide
-
-#endif // _OXIDE_SHARED_BROWSER_FILE_PICKER_H_
diff --git a/shared/browser/oxide_web_view.cc b/shared/browser/oxide_web_view.cc
index ac0dbaa..457f83a 100644
--- a/shared/browser/oxide_web_view.cc
+++ b/shared/browser/oxide_web_view.cc
@@ -80,7 +80,7 @@
 #include "oxide_content_browser_client.h"
 #include "oxide_event_utils.h"
 #include "oxide_favicon_helper.h"
-#include "oxide_file_picker.h"
+#include "file_picker_host.h"
 #include "oxide_find_controller.h"
 #include "oxide_fullscreen_helper.h"
 #include "oxide_render_widget_host_view.h"
@@ -611,14 +611,18 @@ content::JavaScriptDialogManager* WebView::GetJavaScriptDialogManager(
 
 void WebView::RunFileChooser(content::RenderFrameHost* render_frame_host,
                              const content::FileChooserParams& params) {
-  FilePicker* file_picker = client_->CreateFilePicker(render_frame_host);
-  if (!file_picker) {
-    std::vector<content::FileChooserFileInfo> empty;
-    render_frame_host->FilesSelectedInChooser(empty, params.mode);
-    return;
-  }
+  active_file_picker_ = base::MakeUnique<FilePickerHost>(
+      render_frame_host, params,
+      base::Bind(&WebView::DidCloseFileChooser, base::Unretained(this)));
+
+  active_file_picker_->Run();
+}
+
+void WebView::DidCloseFileChooser() {
+  DCHECK(active_file_picker_);
 
-  file_picker->Run(params);
+  base::ThreadTaskRunnerHandle::Get()->DeleteSoon(
+      FROM_HERE, active_file_picker_.release());
 }
 
 bool WebView::EmbedsFullscreenWidget() const {
diff --git a/shared/browser/oxide_web_view.h b/shared/browser/oxide_web_view.h
index 6d37384..8b78226 100644
--- a/shared/browser/oxide_web_view.h
+++ b/shared/browser/oxide_web_view.h
@@ -63,7 +63,7 @@ namespace oxide {
 
 class BrowserContext;
 class CompositorFrameData;
-class FilePicker;
+class FilePickerHost;
 class JavaScriptDialogFactory;
 class RenderWidgetHostView;
 class WebContentsClient;
@@ -207,6 +207,8 @@ class OXIDE_SHARED_EXPORT WebView : public ScriptMessageTarget,
                              const cc::CompositorFrameMetadata& metadata);
   void EditingCapabilitiesChanged();
 
+  void DidCloseFileChooser();
+
   // ScriptMessageTarget implementation
   virtual size_t GetScriptMessageHandlerCount() const override;
   virtual const ScriptMessageHandler* GetScriptMessageHandlerAt(
@@ -328,7 +330,7 @@ class OXIDE_SHARED_EXPORT WebView : public ScriptMessageTarget,
 
   WebContentsUniquePtr web_contents_;
 
-  base::WeakPtr<FilePicker> active_file_picker_;
+  std::unique_ptr<FilePickerHost> active_file_picker_;
 
   ContentType blocked_content_;
 
diff --git a/shared/browser/oxide_web_view_client.cc b/shared/browser/oxide_web_view_client.cc
index 50aeb59..8d67986 100644
--- a/shared/browser/oxide_web_view_client.cc
+++ b/shared/browser/oxide_web_view_client.cc
@@ -17,6 +17,7 @@
 
 #include "oxide_web_view_client.h"
 
+
 namespace oxide {
 
 WebViewClient::~WebViewClient() {}
@@ -61,10 +62,6 @@ bool WebViewClient::AddMessageToConsole(int32_t level,
 void WebViewClient::FrameMetadataUpdated(
     const cc::CompositorFrameMetadata& old) {}
 
-FilePicker* WebViewClient::CreateFilePicker(content::RenderFrameHost* rfh) {
-  return nullptr;
-}
-
 void WebViewClient::ContentBlocked() {}
 
 void WebViewClient::PrepareToCloseResponseReceived(bool proceed) {}
diff --git a/shared/browser/oxide_web_view_client.h b/shared/browser/oxide_web_view_client.h
index c27641e..83c0728 100644
--- a/shared/browser/oxide_web_view_client.h
+++ b/shared/browser/oxide_web_view_client.h
@@ -35,14 +35,12 @@ class CompositorFrameMetadata;
 
 namespace content {
 struct ContextMenuParams;
-class RenderFrameHost;
 class WebContents;
 }
 
 namespace oxide {
 
 class CertificateError;
-class FilePicker;
 class WebView;
 
 // A class for customizing the behaviour of WebView
@@ -90,9 +88,6 @@ class OXIDE_SHARED_EXPORT WebViewClient : public ScriptMessageTarget {
   // TODO(chrisccoulson): Get rid of |old| and replace with |changed_flags|
   virtual void FrameMetadataUpdated(const cc::CompositorFrameMetadata& old);
 
-  // XXX(chrisccoulson): WebView currently just proxies straight to this -
-  //    should this get its own interface?
-  virtual FilePicker* CreateFilePicker(content::RenderFrameHost* rfh);
 
   // TODO(chrisccoulson): Rename to BlockedContentChanged or something
   // TODO(chrisccoulson): Move content tracking to a separate class with its
diff --git a/shared/browser/web_contents_client.cc b/shared/browser/web_contents_client.cc
index ccc9ae4..de8a840 100644
--- a/shared/browser/web_contents_client.cc
+++ b/shared/browser/web_contents_client.cc
@@ -22,6 +22,7 @@
 #include "shared/browser/touch_selection/touch_editing_menu_controller.h"
 
 #include "web_contents_helper.h"
+#include "shared/browser/file_picker.h"
 
 namespace oxide {
 
@@ -90,4 +91,10 @@ std::unique_ptr<TouchEditingMenu> WebContentsClient::CreateTouchEditingMenu(
   return nullptr;
 }
 
+std::unique_ptr<FilePicker> WebContentsClient::CreateFilePicker(
+    const content::FileChooserParams& params,
+    FilePickerClient* client) {
+  return nullptr;
+}
+
 } // namespace oxide
diff --git a/shared/browser/web_contents_client.h b/shared/browser/web_contents_client.h
index a303858..b6c674f 100644
--- a/shared/browser/web_contents_client.h
+++ b/shared/browser/web_contents_client.h
@@ -34,6 +34,7 @@ class GURL;
 
 namespace content {
 struct ContextMenuParams;
+struct FileChooserParams;
 class WebContents;
 }
 
@@ -43,6 +44,8 @@ class Rect;
 
 namespace oxide {
 
+class FilePicker;
+class FilePickerClient;
 class ResourceDispatcherHostLoginDelegate;
 class TouchEditingMenu;
 class TouchEditingMenuClient;
@@ -95,6 +98,10 @@ class OXIDE_SHARED_EXPORT WebContentsClient {
   virtual std::unique_ptr<TouchEditingMenu> CreateTouchEditingMenu(
       blink::WebContextMenuData::EditFlags edit_flags,
       TouchEditingMenuClient* client);
+
+  virtual std::unique_ptr<FilePicker> CreateFilePicker(
+      const content::FileChooserParams& params,
+      FilePickerClient* client);
 };
 
 } // namespace oxide