Fix playing video files with hash in the filename in Files.app.

chrome/browser/chromeos/extensions/file_manager_util.cc

 // Copyright (c) 2012 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 "chrome/browser/chromeos/extensions/file_manager_util.h"
 
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
@@ skipping 387 matching lines @@
     ExecuteHandler(profile, kFileBrowserDomain, action_id, url);
     return;
   }
 
   std::string url = chrome::kChromeUIFileManagerURL;
   if (action_id.size()) {
     DictionaryValue arg_value;
     arg_value.SetString("action", action_id);
     std::string query;
     base::JSONWriter::Write(&arg_value, &query);
-    url += "?" + net::EscapeUrlEncodedData(query, false);
+    url += "?" +
+        net::EscapeUrlEncodedData(query,
+                                  false);  // Space to %20 instead of +.
   }
   if (!path.empty()) {
     base::FilePath virtual_path;
     if (!ConvertFileToRelativeFileSystemPath(profile, kFileBrowserDomain, path,
                                              &virtual_path))
       return;
-    url += "#/" + net::EscapeUrlEncodedData(virtual_path.value(), false);
+    url += "#/" +

[yoshiki, 2013/03/26 11:44:50]

Should we use "#%2F" instead of "#/", because the path is now encoded by
encodeURIcomponent(), not encodeURI()?

+        net::EscapeUrlEncodedData(virtual_path.value(),
+                                  false);  // Space to %20 instead of +.
   }
 
   ExtensionService* service =
       extensions::ExtensionSystem::Get(profile)->extension_service();
   if (!service)
     return;
 
   const extensions::Extension* extension =
       service->GetExtensionById(kFileBrowserDomain, false);
   if (!extension)
@@ skipping 184 matching lines @@
                                 GURL* url) {
   GURL origin_url = Extension::GetBaseURLFromExtensionId(extension_id);
   base::FilePath virtual_path;
   if (!ConvertFileToRelativeFileSystemPath(profile, extension_id,
            full_file_path, &virtual_path)) {
     return false;
   }
 
   GURL base_url = fileapi::GetFileSystemRootURI(origin_url,
       fileapi::kFileSystemTypeExternal);
-  *url = GURL(base_url.spec() + virtual_path.value());
+  *url = GURL(base_url.spec() +
+              net::EscapeUrlEncodedData(virtual_path.value(),
+                                        false));  // Space to %20 instead of +.
   return true;
 }
 
 bool ConvertFileToRelativeFileSystemPath(
     Profile* profile,
     const std::string& extension_id,
     const base::FilePath& full_file_path,
     base::FilePath* virtual_path) {
   ExtensionService* service =
       extensions::ExtensionSystem::Get(profile)->extension_service();
@@ skipping 61 matching lines @@
 
   // Disable showing Drive unless it's specifically supported.
   arg_value.SetBoolean("disableDrive",
       !file_types || !file_types->support_drive);
 
   std::string json_args;
   base::JSONWriter::Write(&arg_value, &json_args);
 
   // kChromeUIFileManagerURL could not be used since query parameters are not
   // supported for it.
-  std::string url = GetFileBrowserUrl().spec() +
-                    '?' + net::EscapeUrlEncodedData(json_args, false);
+  std::string url = GetFileBrowserUrl().spec() + '?' +
+      net::EscapeUrlEncodedData(json_args,
+                                false);  // Space to %20 instead of +.
   return GURL(url);
 }
 
 string16 GetTitleFromType(ui::SelectFileDialog::Type dialog_type) {
   string16 title;
   switch (dialog_type) {
     case ui::SelectFileDialog::SELECT_NONE:
       // Full page file manager doesn't need a title.
       break;
 
@@ skipping 53 matching lines @@
   // will have no title.
   const int kDialogHeight = 316 + 50;
 
   Profile* profile = ProfileManager::GetDefaultProfileOrOffTheRecord();
 
   base::FilePath virtual_path;
   if (!ConvertFileToRelativeFileSystemPath(profile, kFileBrowserDomain, path,
                                            &virtual_path))
     return;
   std::string url = kActionChoiceUrl;
-  url += "#/" + net::EscapeUrlEncodedData(virtual_path.value(), false);
+  url += "#/" + net::EscapeUrlEncodedData(virtual_path.value(),

[yoshiki, 2013/03/26 11:44:50]

ditto

+                                          false);  // Space to %20 instead of +.
   GURL dialog_url(url);
 
   const gfx::Size screen = ash::Shell::GetScreen()->GetPrimaryDisplay().size();
   const gfx::Rect bounds((screen.width() - kDialogWidth) / 2,
                          (screen.height() - kDialogHeight) / 2,
                          kDialogWidth,
                          kDialogHeight);
 
   Browser* browser = GetBrowserForUrl(dialog_url);
 
@@ skipping 179 matching lines @@
   for (google_apis::OperationProgressStatusList::const_iterator iter =
            list.begin();
        iter != list.end(); ++iter) {
     result_list->Append(
         ProgessStatusToDictionaryValue(profile, extension_id, *iter));
   }
   return result_list.release();
 }
 
 }  // namespace file_manager_util