platform_util::OpenItem fixes

chrome/browser/extensions/file_manager_util.cc

 // Copyright (c) 2011 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/extensions/file_manager_util.h"
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
@@ skipping 28 matching lines @@
 #define FILEBROWSER_URL(PATH) \
     ("chrome-extension://" FILEBROWSER_DOMAIN "/" PATH)
 // This is the "well known" url for the file manager extension from
 // browser/resources/file_manager.  In the future we may provide a way to swap
 // out this file manager for an aftermarket part, but not yet.
 const char kFileBrowserExtensionUrl[] = FILEBROWSER_URL("");
 const char kBaseFileBrowserUrl[] = FILEBROWSER_URL("main.html");
 const char kMediaPlayerUrl[] = FILEBROWSER_URL("mediaplayer.html");
 const char kMediaPlayerPlaylistUrl[] = FILEBROWSER_URL("playlist.html");
 #undef FILEBROWSER_URL
+#undef FILEBROWSER_DOMAIN
+
+namespace {
 
 const char kPdfExtension[] = ".pdf";
 // List of file extension we can open in tab.
 const char* kBrowserSupportedExtensions[] = {
 #if defined(GOOGLE_CHROME_BUILD)
     ".pdf",
 #endif
     ".bmp", ".jpg", ".jpeg", ".png", ".webp", ".gif", ".txt", ".html", ".htm"
 };
 // List of file extension that can be handled with the media player.
@@ skipping 51 matching lines @@
   if (!PluginService::GetInstance()->GetPluginInfoByPath(pdf_path, &plugin))
     return false;
 
   PluginPrefs* plugin_prefs = PluginPrefs::GetForProfile(browser->profile());
   if (!plugin_prefs)
     return false;
 
   return plugin_prefs->IsPluginEnabled(plugin);
 }
 
-// static
-GURL FileManagerUtil::GetFileBrowserExtensionUrl() {
-  return GURL(kFileBrowserExtensionUrl);
-}
-
 // Returns index |ext| has in the |array|. If there is no |ext| in |array|, last
 // element's index is return (last element should have irrelevant value).
 int UMAExtensionIndex(const char *ext,
                       const char** array,
                       size_t array_size) {
   for (size_t i = 0; i < array_size; i++) {
     if (base::strcasecmp(ext, array[i]) == 0) {
       return i;
     }
   }
   return 0;
 }
 
+}  // namespace
+
+// static
+GURL FileManagerUtil::GetFileBrowserExtensionUrl() {
+  return GURL(kFileBrowserExtensionUrl);
+}
+
 // static
 GURL FileManagerUtil::GetFileBrowserUrl() {
   return GURL(kBaseFileBrowserUrl);
 }
 
 // static
 GURL FileManagerUtil::GetMediaPlayerUrl() {
   return GURL(kMediaPlayerUrl);
 }
 
@@ skipping 75 matching lines @@
   }
 
   std::string json_args;
   base::JSONWriter::Write(&arg_value, false, &json_args);
 
   // kChromeUIFileManagerURL could not be used since query parameters are not
   // supported for it.
   std::string url = FileManagerUtil::GetFileBrowserUrl().spec() +
                     '?' + EscapeUrlEncodedData(json_args, false);
   return GURL(url);
-
 }
 
 // static
-void FileManagerUtil::ShowFullTabUrl(Profile*,
-                                     const FilePath& dir) {
+void FileManagerUtil::ViewFolder(const FilePath& dir) {
   Browser* browser = BrowserList::GetLastActive();
   if (!browser)
     return;
 
   FilePath virtual_path;
   if (!FileManagerUtil::ConvertFileToRelativeFileSystemPath(browser->profile(),
                                                             dir,
                                                             &virtual_path)) {
     return;
   }
 
   std::string url = chrome::kChromeUIFileManagerURL;
   url += "#/" + EscapeUrlEncodedData(virtual_path.value(), false);
 
   UserMetrics::RecordAction(UserMetricsAction("ShowFileBrowserFullTab"));
   browser->ShowSingletonTabRespectRef(GURL(url));
 }
 
+// static
 void FileManagerUtil::ViewItem(const FilePath& full_path, bool enqueue) {
   std::string ext = full_path.Extension();
   // For things supported natively by the browser, we should open it
   // in a tab.
   if (IsSupportedBrowserExtension(ext.data()) ||
       ShouldBeOpenedWithPdfPlugin(ext.data())) {
     std::string path;
     path = "file://";
     path.append(EscapeUrlEncodedData(full_path.value(), false));
     if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
@@ skipping 40 matching lines @@
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(
           &browser::ShowErrorBox,
           static_cast<gfx::NativeWindow>(NULL),
           l10n_util::GetStringFUTF16(
               IDS_FILEBROWSER_ERROR_VIEWING_FILE_TITLE,
               UTF8ToUTF16(full_path.BaseName().value())),
           l10n_util::GetStringUTF16(
-              IDS_FILEBROWSER_ERROR_VIEWING_FILE)
-          ));
+              IDS_FILEBROWSER_ERROR_VIEWING_FILE)));
 }
 
 // static
 std::string FileManagerUtil::GetDialogTypeAsString(
     SelectFileDialog::Type dialog_type) {
   std::string type_str;
   switch (dialog_type) {
     case SelectFileDialog::SELECT_NONE:
       type_str = "full-page";
       break;
@@ skipping 13 matching lines @@
     case SelectFileDialog::SELECT_OPEN_MULTI_FILE:
       type_str = "open-multi-file";
       break;
 
     default:
       NOTREACHED();
   }
 
   return type_str;
 }