Prettify output from chrome.fileSystem.getDisplayPath for Windows profile directory

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"
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.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/extensions/shell_window.h"
 #include "chrome/common/extensions/api/file_system.h"
 #include "chrome/common/extensions/permissions/api_permission.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "webkit/fileapi/file_system_util.h"
@@ skipping 10 matching lines @@
 
 const char kOpenFileOption[] = "openFile";
 const char kOpenWritableFileOption[] ="openWritableFile";
 const char kSaveFileOption[] = "saveFile";
 
 namespace file_system = extensions::api::file_system;
 namespace ChooseFile = file_system::ChooseFile;
 
 namespace {
 
+/*struct RewritePair {

[benwells, 2012/07/06 00:34:36]

We should uncomment this and use to simplify g_rewrite_pairs below.

[thorogood, 2012/07/06 06:34:16]

Done. Although this was mostly left over; I actually intended it to be
completely an anonymous inline struct :)

+  int path_key;
+  const char* output;
+};*/
+
+const struct {
+  int path_key;
+  const char* output;
+} g_rewrite_pairs[] = {
+#if defined(OS_WIN)
+  {base::DIR_PROFILE, "HOME"},

[benwells, 2012/07/06 00:34:36]

Can we make HOME a bit ... prettier?

I'm open to ideas ... I like "~", but something like "Sam Thorogood" would be
consistent with Windows Explorer.

[thorogood, 2012/07/06 06:34:16]

Probably - I'm not sure of a consistent way to get the user's login name right
now. I will look.

+#endif
+  {-1, NULL}
+};
+
+void PrettifyPath(FilePath& file_path) {
+  for (int i = 0; g_rewrite_pairs[i].output; ++i) {
+    FilePath candidate_path;
+    if (!PathService::Get(g_rewrite_pairs[i].path_key, &candidate_path)) {

[benwells, 2012/07/06 00:34:36]

Should failure here be an error?

[thorogood, 2012/07/06 06:34:16]

Probably not. Get() returns false if it's just an empty result (as well as for
in error cases); and maybe DIR_PROFILE (or other fields we add later) might not
be available some places.

+      continue;
+    }
+
+    FilePath output = FilePath::FromUTF8Unsafe(g_rewrite_pairs[i].output);
+    if (candidate_path.AppendRelativePath(file_path, &output)) {
+      DCHECK(!output.IsAbsolute());
+      file_path = output;
+      return; // Only prettify the first hit.
+    }
+  }
+}
+
 bool g_skip_picker_for_test = false;
 FilePath* g_path_to_be_picked_for_test;
 
 bool GetFilePathOfFileEntry(const std::string& filesystem_name,
                             const std::string& filesystem_path,
                             const content::RenderViewHost* render_view_host,
                             FilePath* file_path,
                             std::string* error) {
   std::string filesystem_id;
   if (!fileapi::CrackIsolatedFileSystemName(filesystem_name, &filesystem_id)) {
@@ skipping 49 matching lines @@
   std::string filesystem_name;
   std::string filesystem_path;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &filesystem_name));
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(1, &filesystem_path));
 
   FilePath file_path;
   if (!GetFilePathOfFileEntry(filesystem_name, filesystem_path,
                               render_view_host_, &file_path, &error_))
     return false;
 
+  PrettifyPath(file_path);
   result_.reset(base::Value::CreateStringValue(file_path.value()));
   return true;
 }
 
 bool FileSystemEntryFunction::HasFileSystemWritePermission() {
   const extensions::Extension* extension = GetExtension();
   if (!extension)
     return false;
 
   return extension->HasAPIPermission(APIPermission::kFileSystemWrite);
@@ skipping 227 matching lines @@
 
   if (entry_type == WRITABLE && !HasFileSystemWritePermission()) {
     error_ = kRequiresFileSystemWriteError;
     return false;
   }
 
   return ShowPicker(FilePath(), picker_type, entry_type);
 }
 
 }  // namespace extensions