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

Unified Diff: trunk/src/chrome/common/chrome_paths_linux.cc

Issue 284333002: Revert 270872 "Move all callers of GetHomeDir() to PathService::..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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: trunk/src/chrome/common/chrome_paths_linux.cc
===================================================================
--- trunk/src/chrome/common/chrome_paths_linux.cc (revision 270950)
+++ trunk/src/chrome/common/chrome_paths_linux.cc (working copy)
@@ -4,13 +4,11 @@
#include "chrome/common/chrome_paths_internal.h"
-#include "base/base_paths.h"
#include "base/environment.h"
#include "base/file_util.h"
#include "base/memory/scoped_ptr.h"
#include "base/nix/xdg_util.h"
#include "base/path_service.h"
-#include "chrome/common/chrome_paths.h"
namespace chrome {
@@ -36,8 +34,7 @@
#else
*result = GetXDGUserDirectory(xdg_name.c_str(), fallback_name.c_str());
- base::FilePath home;
- PathService::Get(base::DIR_HOME, &home);
+ base::FilePath home = base::GetHomeDir();
if (*result != home) {
base::FilePath desktop;
if (!PathService::Get(base::DIR_USER_DESKTOP, &desktop))
@@ -106,8 +103,7 @@
}
bool GetUserDownloadsDirectorySafe(base::FilePath* result) {
- base::FilePath home;
- PathService::Get(base::DIR_HOME, &home);
+ base::FilePath home = base::GetHomeDir();
*result = home.Append(kDownloadsDir);
return true;
}
« no previous file with comments | « trunk/src/chrome/browser/diagnostics/sqlite_diagnostics.cc ('k') | trunk/src/chrome/common/chrome_paths_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698