Add PathService::Get(chrome::DIR_USER_PICTURES).

chrome/common/chrome_paths_linux.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/common/chrome_paths_internal.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 "base/nix/xdg_util.h"
 
 namespace {
 
 const char kDotConfigDir[] = ".config";
 const char kDownloadsDir[] = "Downloads";
+const char kPicturesDir[] = "Pictures";
 const char kXdgConfigHomeEnvVar[] = "XDG_CONFIG_HOME";
 
 }  // namespace
 
 namespace chrome {
 
 // See http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
 // for a spec on where config files go.  The net effect for most
 // systems is we use ~/.config/chromium/ for Chromium and
 // ~/.config/google-chrome/ for official builds.
@@ skipping 63 matching lines @@
   return true;
 }
 
 bool GetUserDownloadsDirectory(FilePath* result) {
   scoped_ptr<base::Environment> env(base::Environment::Create());
   *result = base::nix::GetXDGUserDirectory(env.get(), "DOWNLOAD",
                                            kDownloadsDir);
   return true;
 }
 
+// We respect the user's preferred pictures location, unless it is
+// ~ or their desktop directory, in which case we default to ~/Pictures.
+bool GetUserPicturesDirectory(FilePath* result) {
+  scoped_ptr<base::Environment> env(base::Environment::Create());
+  *result = base::nix::GetXDGUserDirectory(env.get(), "PICTURES", kPicturesDir);
+
+  FilePath home = file_util::GetHomeDir();
+  if (*result != home) {
+    FilePath desktop;
+    GetUserDesktop(&desktop);
+    if (*result != desktop) {
+      return true;
+    }
+  }
+
+  *result = home.Append(kPicturesDir);
+  return true;
+}
+
 bool GetUserDesktop(FilePath* result) {
   scoped_ptr<base::Environment> env(base::Environment::Create());
   *result = base::nix::GetXDGUserDirectory(env.get(), "DESKTOP", "Desktop");
   return true;
 }
 
 bool ProcessNeedsProfileDir(const std::string& process_type) {
   // For now we have no reason to forbid this on Linux as we don't
   // have the roaming profile troubles there. Moreover the Linux breakpad needs
   // profile dir access in all process if enabled on Linux.
   return true;
 }
 
 }  // namespace chrome