Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / shell_dialogs / select_file_dialog.cc

diff --git a/src/ui/shell_dialogs/select_file_dialog.cc b/src/ui/shell_dialogs/select_file_dialog.cc
index e5abd07..d26fc36 100644 (file)
--- a/src/ui/shell_dialogs/select_file_dialog.cc
+++ b/src/ui/shell_dialogs/select_file_dialog.cc
@@ -46,7 +46,10 @@ void SelectFileDialog::Listener::FileSelectedWithExtraInfo(
     int index,
     void* params) {
   // Most of the dialogs need actual local path, so default to it.
-  FileSelected(file.local_path, index, params);
+  // If local path is empty, use file_path instead.
+  FileSelected(file.local_path.empty() ? file.file_path : file.local_path,
+               index,
+               params);
 }
 
 void SelectFileDialog::Listener::MultiFilesSelectedWithExtraInfo(
@@ -54,7 +57,8 @@ void SelectFileDialog::Listener::MultiFilesSelectedWithExtraInfo(
     void* params) {
   std::vector<base::FilePath> file_paths;
   for (size_t i = 0; i < files.size(); ++i)
-    file_paths.push_back(files[i].local_path);
+    file_paths.push_back(files[i].local_path.empty() ? files[i].file_path
+                                                     : files[i].local_path);
 
   MultiFilesSelected(file_paths, params);
 }