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

Unified Diff: base/base_paths_posix.cc

Issue 10910209: Add new PathService paths for Windows' All Users Desktop and Quick Launch folders. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Adjust links to pass presubmit Created 8 years, 3 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 | « base/base_paths_posix.h ('k') | base/base_paths_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base_paths_posix.cc
diff --git a/base/base_paths_posix.cc b/base/base_paths_posix.cc
index 95e7585ec5c82df93b97fe6436945c56301f8d81..834dee344b605c0572dbc50d019635f85fdb6ecd 100644
--- a/base/base_paths_posix.cc
+++ b/base/base_paths_posix.cc
@@ -2,12 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/base_paths.h"
+// Defines base::PathProviderPosix, default path provider on POSIX OSes that
+// don't have their own base_paths_OS.cc implementation (i.e. all but Mac and
+// Android).
#include <ostream>
#include <string>
-#include "build/build_config.h"
+#include "base/base_paths.h"
#include "base/environment.h"
#include "base/file_path.h"
#include "base/file_util.h"
@@ -16,6 +18,7 @@
#include "base/path_service.h"
#include "base/process_util.h"
#include "base/nix/xdg_util.h"
+#include "build/build_config.h"
#if defined(OS_FREEBSD)
#include <sys/param.h>
@@ -96,6 +99,9 @@ bool PathProviderPosix(int key, FilePath* result) {
<< "Try running from your chromium/src directory.";
return false;
}
+ case base::DIR_USER_DESKTOP:
+ *result = base::nix::GetXDGUserDirectory("DESKTOP", "Desktop");
+ return true;
case base::DIR_CACHE: {
scoped_ptr<base::Environment> env(base::Environment::Create());
FilePath cache_dir(base::nix::GetXDGDirectory(env.get(), "XDG_CACHE_HOME",
@@ -103,10 +109,9 @@ bool PathProviderPosix(int key, FilePath* result) {
*result = cache_dir;
return true;
}
- case base::DIR_HOME: {
+ case base::DIR_HOME:
*result = file_util::GetHomeDir();
return true;
- }
}
return false;
}
« no previous file with comments | « base/base_paths_posix.h ('k') | base/base_paths_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698