 +document.addEventListener('DOMContentLoaded',
 +                          filePicker.initialize);
 diff --git a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc
-index 62c391d..a97503f 100644
+index 62c391d..9389337 100644
 --- a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc
 +++ b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc
 @@ -30,6 +30,10 @@

From 3124c8baddd7661ed5f2845333fff9086a03373d Mon Sep 17 00:00:00 2001
From: Joone Hur <joone.hur@intel.com>
Date: Fri, 11 Sep 2015 18:45:01 -0700
Subject: [PATCH 08/14] Add file picker support using WebUI

 #if defined(USE_X11) && !defined(OS_CHROMEOS)
 #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h"
 #endif
@@ -108,6 +112,10 @@ void ChromeBrowserMainExtraPartsAura::PreEarlyInitialization() {
   gtk2_ui->SetNativeThemeOverride(base::Bind(&GetNativeThemeForWindow));
   views::LinuxUI::SetInstance(gtk2_ui);
 #endif
+
+#if defined(USE_OZONE)
+  views::LinuxUI::SetInstance(BuildWebUI());
+#endif
 }
 
 void ChromeBrowserMainExtraPartsAura::ToolkitInitialized() {
@@ -123,6 +131,10 @@ void ChromeBrowserMainExtraPartsAura::ToolkitInitialized() {
 #endif
   views::LinuxUI::instance()->Initialize();
 #endif
+
+#if defined(USE_OZONE)
+  views::LinuxUI::instance()->Initialize();
+#endif
 }
 
 void ChromeBrowserMainExtraPartsAura::PreCreateThreads() {
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
index 3128710..0af69cc 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
