Be explicit about target type in platform_util::OpenItem()

chrome/browser/chromeos/file_manager/open_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/file_manager/open_util.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 69 matching lines @@
          action_id == "open" ||
          action_id == "select");
   content::RecordAction(base::UserMetricsAction("ShowFileBrowserFullTab"));
 
   file_tasks::TaskDescriptor task(kFileManagerAppId,
                                   file_tasks::TASK_TYPE_FILE_BROWSER_HANDLER,
                                   action_id);
   ExecuteFileTaskForUrl(profile, task, url);
 }
 
-// Opens the file with fetched MIME type and calls the callback.
+void WarnOnOpenFileFailure(Profile* profile,
+                                 const base::FilePath& file_path) {

[hashimoto, 2014/09/29 05:34:13]

nit: indent.

[asanka, 2014/09/29 16:17:53]

Done.

+  int message;

[hashimoto, 2014/09/29 05:34:13]

nit: While you are here, could you fix this line not to leave this variable
uninitialized?

[asanka, 2014/09/29 16:17:52]

Done.

+  if (file_path.Extension() == FILE_PATH_LITERAL(".dmg"))
+    message = IDS_FILE_BROWSER_ERROR_VIEWING_FILE_FOR_DMG;
+  else if (file_path.Extension() == FILE_PATH_LITERAL(".exe") ||
+           file_path.Extension() == FILE_PATH_LITERAL(".msi"))
+    message = IDS_FILE_BROWSER_ERROR_VIEWING_FILE_FOR_EXECUTABLE;
+  else
+    message = IDS_FILE_BROWSER_ERROR_VIEWING_FILE;
+  ShowWarningMessageBox(profile, file_path, message);
+}
+
+// Opens the file with fetched MIME type and warns the user on failure.
 void OpenFileWithMimeType(Profile* profile,
                           const base::FilePath& path,
                           const GURL& url,
-                          const base::Callback<void(bool)>& callback,
                           const std::string& mime_type) {
   extensions::app_file_handler_util::PathAndMimeTypeSet path_mime_set;
   path_mime_set.insert(std::make_pair(path, mime_type));
 
   std::vector<GURL> file_urls;
   file_urls.push_back(url);
 
   std::vector<file_tasks::FullTaskDescriptor> tasks;
   file_tasks::FindAllTypesOfTasks(
       profile,
       drive::util::GetDriveAppRegistryByProfile(profile),
       path_mime_set,
       file_urls,
       &tasks);
 
   if (tasks.empty()) {
-    callback.Run(false);
+    WarnOnOpenFileFailure(profile, path);
     return;
   }
 
   const file_tasks::FullTaskDescriptor* chosen_task = &tasks[0];
   for (size_t i = 0; i < tasks.size(); ++i) {
     if (tasks[i].is_default()) {
       chosen_task = &tasks[i];
       break;
     }
   }
 
   ExecuteFileTaskForUrl(profile, chosen_task->task_descriptor(), url);
-  callback.Run(true);
-}
-
-// Opens the file specified by |url| by finding and executing a file task for
-// the file. In case of success, calls |callback| with true. Otherwise the
-// returned value is false.
-void OpenFile(Profile* profile,
-              const base::FilePath& path,
-              const GURL& url,
-              const base::Callback<void(bool)>& callback) {
-  extensions::app_file_handler_util::GetMimeTypeForLocalPath(
-      profile,
-      path,
-      base::Bind(&OpenFileWithMimeType, profile, path, url, callback));
-}
-
-// Called when execution of ContinueOpenItem() is completed.
-void OnContinueOpenItemCompleted(Profile* profile,
-                                 const base::FilePath& file_path,
-                                 bool result) {
-  if (!result) {
-    int message;
-    if (file_path.Extension() == FILE_PATH_LITERAL(".dmg"))
-      message = IDS_FILE_BROWSER_ERROR_VIEWING_FILE_FOR_DMG;
-    else if (file_path.Extension() == FILE_PATH_LITERAL(".exe") ||
-             file_path.Extension() == FILE_PATH_LITERAL(".msi"))
-      message = IDS_FILE_BROWSER_ERROR_VIEWING_FILE_FOR_EXECUTABLE;
-    else
-      message = IDS_FILE_BROWSER_ERROR_VIEWING_FILE;
-    ShowWarningMessageBox(profile, file_path, message);
-  }
-}
-
-// Used to implement OpenItem().
-void ContinueOpenItem(Profile* profile,
-                      const base::FilePath& file_path,
-                      const GURL& url,
-                      base::File::Error error) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-
-  if (error == base::File::FILE_OK) {
-    // A directory exists at |url|. Open it with the file manager.
-    OpenFileManagerWithInternalActionId(profile, url, "open");
-  } else {
-    // |url| should be a file. Open it.
-    OpenFile(profile,
-             file_path,
-             url,
-             base::Bind(&OnContinueOpenItemCompleted, profile, file_path));
-  }
 }
 
 // Converts the |given_path| passed from external callers to the form that the
 // file manager can correctly handle. It first migrates old Drive/Download
 // folder path to the new formats, and then converts path to filesystem URL.
 //
 // When conversion fails, it shows a warning dialog UI and returns false.
 bool ConvertPath(Profile* profile,
                  const base::FilePath& given_path,
                  base::FilePath* path,
@@ skipping 19 matching lines @@
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   base::FilePath converted_path;
   GURL url;
   if (!ConvertPath(profile, file_path, &converted_path, &url))
     return;
 
   OpenFileManagerWithInternalActionId(profile, url, "auto-open");
 }
 
-void OpenItem(Profile* profile, const base::FilePath& file_path) {
+void OpenFile(Profile* profile, const base::FilePath& file_path) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   base::FilePath converted_path;
+  GURL url;
+  if (!ConvertPath(profile, file_path, &converted_path, &url))
+    return;
+
+  extensions::app_file_handler_util::GetMimeTypeForLocalPath(
+      profile,
+      converted_path,
+      base::Bind(&OpenFileWithMimeType, profile, converted_path, url));
+}
+
+void OpenFolder(Profile* profile, const base::FilePath& file_path) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+
+  base::FilePath converted_path;
   GURL url;
   if (!ConvertPath(profile, file_path, &converted_path, &url))
     return;
 
-  CheckIfDirectoryExists(
-      GetFileSystemContextForExtensionId(profile, kFileManagerAppId),
-      url,
-      base::Bind(&ContinueOpenItem, profile, converted_path, url));
+  // This call will only open Files.app.
+  OpenFileManagerWithInternalActionId(profile, url, "open");
 }
 
 void ShowItemInFolder(Profile* profile, const base::FilePath& file_path) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   base::FilePath converted_path;
   GURL url;
   if (!ConvertPath(profile, file_path, &converted_path, &url))
     return;
 
   // This action changes the selection so we do not reuse existing tabs.
   OpenFileManagerWithInternalActionId(profile, url, "select");
 }
 
 }  // namespace util
 }  // namespace file_manager