Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1092)

Unified Diff: chrome/browser/extensions/api/file_system/file_system_api.cc

Issue 10693089: Prettify output from chrome.fileSystem.getDisplayPath for Windows profile directory (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/extensions/api/file_system/file_system_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/file_system/file_system_api.cc
diff --git a/chrome/browser/extensions/api/file_system/file_system_api.cc b/chrome/browser/extensions/api/file_system/file_system_api.cc
index c6fc2ec98af12f1abcba331b9f16f27e1f3431fc..871125e0030030d2aab9d8263ef184ef5e896dbb 100644
--- a/chrome/browser/extensions/api/file_system/file_system_api.cc
+++ b/chrome/browser/extensions/api/file_system/file_system_api.cc
@@ -7,6 +7,8 @@
#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/chrome_select_file_policy.h"
@@ -38,6 +40,44 @@ namespace ChooseFile = file_system::ChooseFile;
namespace {
+struct RewritePair {
+ int path_key;
+ const char* output;
+};
+
+const RewritePair g_rewrite_pairs[] = {
+#if defined(OS_WIN)
+ {base::DIR_PROFILE, "~"},
+#endif
+};
+
+FilePath PrettifyPath(const FilePath& file_path) {
+ // Note that when g_rewrite_pairs includes at least one value on all
+ // platforms, this code can be cleaned up.
+#if defined(OS_WIN)
+ size_t size = arraysize(g_rewrite_pairs);
+#else
+ size_t size = 0;
+#endif
+
+ for (size_t i = 0; i < size; ++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);
+ 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;
+ }
+ }
+
+ return file_path;
+}
+
bool g_skip_picker_for_test = false;
FilePath* g_path_to_be_picked_for_test;
@@ -107,6 +147,7 @@ bool FileSystemGetDisplayPathFunction::RunImpl() {
render_view_host_, &file_path, &error_))
return false;
+ file_path = PrettifyPath(file_path);
result_.reset(base::Value::CreateStringValue(file_path.value()));
return true;
}
« no previous file with comments | « no previous file | chrome/browser/extensions/api/file_system/file_system_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698