Prettify Mac names, rewrite getDisplayPath API call to focus on $HOME

chrome/browser/extensions/api/file_system/file_system_api.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/extensions/api/file_system/file_system_api.h"
 
+#if defined(OS_MACOSX)
+#include "base/mac/foundation_util.h"
+#endif
+
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/shell_window_registry.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
 #include "chrome/browser/ui/extensions/shell_window.h"
@@ skipping 22 matching lines @@
 const char kOpenWritableFileOption[] ="openWritableFile";
 const char kSaveFileOption[] = "saveFile";
 
 namespace file_system = extensions::api::file_system;
 namespace ChooseFile = file_system::ChooseFile;
 
 namespace {
 
 struct RewritePair {
   int path_key;
-  const char* output;
+  const char* output;  // NULL indicates that this display name should be
+                       // retrieved from the system.
 };
 
 const RewritePair g_rewrite_pairs[] = {
+#if defined(OS_MACOSX)
+  {base::DIR_DESKTOP, NULL},
+  {base::DIR_DOCUMENTS, NULL},
+  {base::DIR_DOWNLOADS, NULL},
+#endif
 #if defined(OS_WIN)
   {base::DIR_PROFILE, "~"},
 #elif defined(OS_POSIX)
   {base::DIR_HOME, "~"},
 #endif
 };
 
 FilePath PrettifyPath(const FilePath& file_path) {
 #if defined(OS_WIN) || defined(OS_POSIX)
   for (size_t i = 0; i < arraysize(g_rewrite_pairs); ++i) {
     FilePath candidate_path;
     if (!PathService::Get(g_rewrite_pairs[i].path_key, &candidate_path))
       continue;  // We don't DCHECK this value, as Get will return false even
                  // if the path_key gives a blank string as a result.
 
-    FilePath output = FilePath::FromUTF8Unsafe(g_rewrite_pairs[i].output);
+    FilePath output;
+    if (!g_rewrite_pairs[i].output) {
+#if defined(OS_MACOSX)
+      if (!candidate_path.IsParent(file_path))
+        continue;
+
+      std::string display_name;
+      base::mac::GetDisplayNameForPath(candidate_path, &display_name);
+      output = FilePath::FromUTF8Unsafe(display_name);
+#else
+      NOTREACHED();
+#endif
+    } else {
+      output = FilePath::FromUTF8Unsafe(g_rewrite_pairs[i].output);
+    }
+
     if (candidate_path.AppendRelativePath(file_path, &output)) {
       // The output path must not be absolute, as it might collide with the
       // real filesystem.
       DCHECK(!output.IsAbsolute());
       return output;
     }
   }
 #endif
 
   return file_path;
@@ skipping 350 matching lines @@
 
   if (entry_type == WRITABLE && !HasFileSystemWritePermission()) {
     error_ = kRequiresFileSystemWriteError;
     return false;
   }
 
   return ShowPicker(suggested_name, picker_type, entry_type);
 }
 
 }  // namespace extensions