[Linux] Add support for file-picker

This is part of the file-picker patch, which belongs to Chromium content shell. Bug=XWALK-950
joone · Mar 22, 2015 · dc646fb · dc646fb
1 parent 903b90a
commit dc646fb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/content/browser/webui/content_web_ui_controller_factory.cc b/content/browser/webui/content_web_ui_controller_factory.cc
@@ -14,6 +14,9 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/common/url_constants.h"
+#if defined(USE_AURA) && defined(OS_LINUX)
+#include "xwalk/runtime/browser/ui/webui/file_picker/file_picker_ui.h"
+#endif
 
 #if defined(ENABLE_WEBRTC)
 #include "content/browser/media/webrtc_internals_ui.h"
@@ -26,6 +29,9 @@ WebUI::TypeID ContentWebUIControllerFactory::GetWebUIType(
   if (url.host() == kChromeUIWebRTCInternalsHost ||
 #if !defined(OS_ANDROID)
       url.host() == kChromeUITracingHost ||
+#endif
+#if defined(USE_AURA) && defined(OS_LINUX)
+	  url.host() == kChromeUIFilePickerHost ||
 #endif
       url.host() == kChromeUIGpuHost ||
       url.host() == kChromeUIIndexedDBInternalsHost ||
@@ -63,6 +69,10 @@ WebUIController* ContentWebUIControllerFactory::CreateWebUIControllerForURL(
   if (url.host() == kChromeUITracingHost)
     return new TracingUI(web_ui);
 #endif
+#if defined(USE_AURA) && defined(OS_LINUX)
+  if (url.host() == kChromeUIFilePickerHost)
+    return new ui::FilePickerUI(web_ui);
+#endif
 
 #if defined(ENABLE_WEBRTC)
   if (url.host() == kChromeUIWebRTCInternalsHost)

diff --git a/content/public/common/url_constants.cc b/content/public/common/url_constants.cc
@@ -26,6 +26,7 @@ const char kChromeUIAccessibilityHost[] = "accessibility";
 const char kChromeUIBlobInternalsHost[] = "blob-internals";
 const char kChromeUIBrowserCrashHost[] = "inducebrowsercrashforrealz";
 const char kChromeUIGpuHost[] = "gpu";
+const char kChromeUIFilePickerHost[] = "file-picker";
 const char kChromeUIHistogramHost[] = "histograms";
 const char kChromeUIMediaInternalsHost[] = "media-internals";
 const char kChromeUINetworkViewCacheHost[] = "view-http-cache";
@@ -38,6 +39,7 @@ const char kChromeUIWebRTCInternalsHost[] = "webrtc-internals";
 const char kChromeUIBrowserCrashURL[] = "chrome://inducebrowsercrashforrealz";
 const char kChromeUICrashURL[] = "chrome://crash";
 const char kChromeUIDumpURL[] = "chrome://crashdump";
+const char kChromeUIFilePickerURL[] = "chrome://file-picker";
 const char kChromeUIGpuCleanURL[] = "chrome://gpuclean";
 const char kChromeUIGpuCrashURL[] = "chrome://gpucrash";
 const char kChromeUIGpuHangURL[] = "chrome://gpuhang";

diff --git a/content/public/common/url_constants.h b/content/public/common/url_constants.h
@@ -33,6 +33,7 @@ CONTENT_EXPORT extern const char kChromeUIAppCacheInternalsHost[];
 CONTENT_EXPORT extern const char kChromeUIBlobInternalsHost[];
 CONTENT_EXPORT extern const char kChromeUIBrowserCrashHost[];
 CONTENT_EXPORT extern const char kChromeUIGpuHost[];
+CONTENT_EXPORT extern const char kChromeUIFilePickerHost[];
 CONTENT_EXPORT extern const char kChromeUIHistogramHost[];
 CONTENT_EXPORT extern const char kChromeUIIndexedDBInternalsHost[];
 CONTENT_EXPORT extern const char kChromeUIMediaInternalsHost[];
@@ -47,6 +48,7 @@ CONTENT_EXPORT extern const char kChromeUIWebRTCInternalsHost[];
 CONTENT_EXPORT extern const char kChromeUIBrowserCrashURL[];
 CONTENT_EXPORT extern const char kChromeUICrashURL[];
 CONTENT_EXPORT extern const char kChromeUIDumpURL[];
+CONTENT_EXPORT extern const char kChromeUIFilePickerURL[];
 CONTENT_EXPORT extern const char kChromeUIGpuCleanURL[];
 CONTENT_EXPORT extern const char kChromeUIGpuCrashURL[];
 CONTENT_EXPORT extern const char kChromeUIGpuHangURL[];