Adding support for multiple files in FileChooser

webkit/glue/chrome_client_impl.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "base/compiler_specific.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
 #include "Cursor.h"
@@ skipping 25 matching lines @@
 
 // Callback class that's given to the WebViewDelegate during a file choose
 // operation.
 class WebFileChooserCallbackImpl : public WebFileChooserCallback {
  public:
   WebFileChooserCallbackImpl(PassRefPtr<WebCore::FileChooser> file_chooser)
       : file_chooser_(file_chooser) {
   }
 
   void OnFileChoose(const std::vector<std::wstring>& file_names) {
-    assert(file_names.size() <= 1);
     if (file_names.empty()) {
-      file_chooser_->chooseFile(webkit_glue::StdWStringToString(L""));
+      file_chooser_->chooseFile(WebCore::String(""));
+    } else if (file_names.size() == 1) {
+      file_chooser_->chooseFile(
+        webkit_glue::StdWStringToString(file_names.front()));
     } else {
-      file_chooser_->chooseFile(
-        webkit_glue::StdWStringToString(file_names.front().c_str()));
+      Vector<WebCore::String> paths;
+      for (std::vector<std::wstring>::const_iterator filename =
+             file_names.begin(); filename != file_names.end(); ++filename) {
+        paths.append(webkit_glue::StdWStringToString(*filename));
+      }
+      file_chooser_->chooseFiles(paths);
     }
   }
 
  private:
   RefPtr<WebCore::FileChooser> file_chooser_;
   DISALLOW_EVIL_CONSTRUCTORS(WebFileChooserCallbackImpl);
 };
 
 ChromeClientImpl::ChromeClientImpl(WebViewImpl* webview)
     : webview_(webview),
@@ skipping 389 matching lines @@
     const WebCore::String& databaseName) {
   // TODO(tc): If we enable the storage API, we need to implement this function.
 }
 
 void ChromeClientImpl::runOpenPanel(WebCore::Frame* frame,
   PassRefPtr<WebCore::FileChooser> fileChooser) {
   WebViewDelegate* delegate = webview_->delegate();
   if (!delegate)
     return;
 
+  bool multiple_files = fileChooser->allowsMultipleFiles();
+
   std::wstring suggestion;
   if (fileChooser->filenames().size() > 0)
     suggestion = webkit_glue::StringToStdWString(fileChooser->filenames()[0]);
 
   WebFileChooserCallbackImpl* chooser = new WebFileChooserCallbackImpl(fileChooser);
-  delegate->RunFileChooser(false, std::wstring(), suggestion,
+  delegate->RunFileChooser(multiple_files, std::wstring(), suggestion,
                            std::wstring(), chooser);
 }
 
 void ChromeClientImpl::popupOpened(WebCore::FramelessScrollView* popup_view,
                                    const WebCore::IntRect& bounds,
                                    bool activatable) {
   WebViewDelegate* d = webview_->delegate();
   if (d) {
     WebWidgetImpl* webwidget =
         static_cast<WebWidgetImpl*>(d->CreatePopupWidget(webview_,
@@ skipping 31 matching lines @@
   WebViewDelegate* d = webview_->delegate();
   if (d)
     d->DisableSuddenTermination();
 }
 
 void ChromeClientImpl::formStateDidChange(const WebCore::Node*) {
   WebViewDelegate* d = webview_->delegate();
   if (d)
     d->OnNavStateChanged(webview_);
 }