Files.app: Enable externalfile: protocol for MTP volumes.

chrome/browser/chromeos/file_manager/open_with_browser.cc

 // Copyright 2013 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/file_manager/open_with_browser.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/fileapi/external_file_url_util.h"
+#include "chrome/browser/chromeos/filemanager/filesystem_api_util.h"
 #include "chrome/browser/drive/drive_api_util.h"
 #include "chrome/browser/plugins/plugin_prefs.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 97 matching lines @@
 // Note that an alternate url is a URL to open a hosted document.
 GURL ReadUrlFromGDocOnBlockingPool(const base::FilePath& file_path) {
   GURL url = drive::util::ReadUrlFromGDocFile(file_path);
   if (url.is_empty())
     url = net::FilePathToFileURL(file_path);
   return url;
 }
 
 }  // namespace
 
-bool OpenFileWithBrowser(Profile* profile, const base::FilePath& file_path) {
+bool OpenFileWithBrowser(Profile* profile,
+                         const storage::FileSystemURL& file_system_url) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(profile);
 
+  const base::FilePath file_path = file_system_url.path();
+
   // For things supported natively by the browser, we should open it
   // in a tab.
   if (IsViewableInBrowser(file_path) ||
       ShouldBeOpenedWithPlugin(profile, file_path.Extension())) {
-    GURL page_url = net::FilePathToFileURL(file_path);
-    // Override drive resource to point to internal handler instead of file URL.
-    if (drive::util::IsUnderDriveMountPoint(file_path)) {
-      page_url = chromeos::FilePathToExternalFileURL(
-          drive::util::ExtractDrivePath(file_path));
-    }
+    // Use external file URL if it is provided for the file system.
+    GURL page_url = chromeos::FileSystemURLToExternalFileURL(file_system_url);
+    if (page_url.is_empty())
+      page_url = net::FilePathToFileURL(file_path);
+
     OpenNewTab(profile, page_url);
     return true;
   }
 
   if (drive::util::HasHostedDocumentExtension(file_path)) {
-    if (drive::util::IsUnderDriveMountPoint(file_path)) {
-      // The file is on Google Docs. Open with drive URL.
-      GURL url = chromeos::FilePathToExternalFileURL(
-          drive::util::ExtractDrivePath(file_path));
+    if (file_manager::util::IsUnderNonNativeLocalPath(profile, file_path)) {
+      // The file is on a non-native volume. Use external file URL. If the file
+      // is on the drive volume, ExternalFileURLRequestJob redirects the URL to
+      // drive's web interface. Otherwise (e.g. MTP, FSP), the file is mrely

[mtomasz, 2014/09/25 09:53:11]

typo: mrely -> ?

[hirono, 2014/09/25 11:01:53]

Done.

+      // downloaded in a browser tab.
+      const GURL url =
+          chromeos::FileSystemURLToExternalFileURL(file_system_url);
+      DCHECK(!url.is_empty());
       OpenNewTab(profile, url);
     } else {
       // The file is local (downloaded from an attachment or otherwise copied).
       // Parse the file to extract the Docs url and open this url.
       base::PostTaskAndReplyWithResult(
           BrowserThread::GetBlockingPool(),
           FROM_HERE,
           base::Bind(&ReadUrlFromGDocOnBlockingPool, file_path),
           base::Bind(&OpenNewTab, profile));
     }
@@ skipping 15 matching lines @@
       base::FilePath::FromUTF8Unsafe("dummy").AddExtension(file_extension);
   if (file_path.MatchesExtension(kPdfExtension))
     return IsPdfPluginEnabled(profile);
   if (file_path.MatchesExtension(kSwfExtension))
     return IsFlashPluginEnabled(profile);
   return false;
 }
 
 }  // namespace util
 }  // namespace file_manager