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

Unified Diff: webkit/chromeos/fileapi/cros_mount_point_provider.cc

Issue 10843041: Add OS_CHROMEOS case in file_util::GetHomeDir() (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Revert GetHomeDirectory() and fix file_util::GetHome() 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
Index: webkit/chromeos/fileapi/cros_mount_point_provider.cc
diff --git a/webkit/chromeos/fileapi/cros_mount_point_provider.cc b/webkit/chromeos/fileapi/cros_mount_point_provider.cc
index f30b5ce52bb1e25ac83f11b9f38689f94217d126..7611e56dda4d4e09f148e6ebdc61e6aac257da98 100644
--- a/webkit/chromeos/fileapi/cros_mount_point_provider.cc
+++ b/webkit/chromeos/fileapi/cros_mount_point_provider.cc
@@ -8,6 +8,7 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
+#include "base/path_service.h"
#include "base/stringprintf.h"
#include "base/synchronization/lock.h"
#include "base/utf_string_conversions.h"
@@ -30,18 +31,6 @@ namespace {
const char kChromeUIScheme[] = "chrome";
-// Returns the home directory path, or an empty string if the home directory
-// is not found.
-std::string GetHomeDirectory() {
- if (base::chromeos::IsRunningOnChromeOS())
- return "/home/chronos/user";
-
- const char* home = getenv("HOME");
- if (home)
- return home;
- return "";
-}
-
} // namespace
namespace chromeos {
@@ -63,10 +52,9 @@ CrosMountPointProvider::CrosMountPointProvider(
: special_storage_policy_(special_storage_policy),
file_access_permissions_(new FileAccessPermissions()),
local_file_util_(new fileapi::LocalFileUtil()) {
- const std::string home = GetHomeDirectory();
- if (!home.empty()) {
- AddLocalMountPoint(
- FilePath::FromUTF8Unsafe(home).AppendASCII("Downloads"));
+ FilePath home_path;
+ if (PathService::Get(base::DIR_HOME, &home_path)) {
+ AddLocalMountPoint(home_path.AppendASCII("Downloads"));
}
kochi 2012/08/03 14:35:59 You can remove this braces as the statement fits i
Haruki Sato 2012/08/06 02:37:49 Done. Thanks.
AddLocalMountPoint(FilePath(FILE_PATH_LITERAL("/media/archive")));
AddLocalMountPoint(FilePath(FILE_PATH_LITERAL("/media/removable")));
« chrome/browser/chromeos/gdata/gdata_cache.cc ('K') | « chrome/browser/chromeos/gdata/gdata_cache.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698