summaryrefslogtreecommitdiffstats
path: root/chrome/common/chrome_paths_linux.cc
diff options
context:
space:
mode:
authorgrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-20 14:08:27 +0000
committergrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-20 14:08:27 +0000
commitd49062d07fcd2c2dddb02da7b3c503d813c1736a (patch)
tree0dec951047205ed230ba955aba4492878ea8abd4 /chrome/common/chrome_paths_linux.cc
parent9889f42a78b3782105e157a5e05ca2d657d860ab (diff)
downloadchromium_src-d49062d07fcd2c2dddb02da7b3c503d813c1736a.zip
chromium_src-d49062d07fcd2c2dddb02da7b3c503d813c1736a.tar.gz
chromium_src-d49062d07fcd2c2dddb02da7b3c503d813c1736a.tar.bz2
Revert 143094 - ChromeOS: Don't report the presence of a user pictures directory.
This change broke ExperimentalExtensionApiTest.MediaGallery test on Linux ChromiumOS Tests (2) as of buid 3776 (http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%282%29/builds/3776). BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/10577026 TBR=thestig@chromium.org Review URL: https://chromiumcodereview.appspot.com/10559084 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143169 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/chrome_paths_linux.cc')
-rw-r--r--chrome/common/chrome_paths_linux.cc5
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome/common/chrome_paths_linux.cc b/chrome/common/chrome_paths_linux.cc
index adfcca6..b6bcc54 100644
--- a/chrome/common/chrome_paths_linux.cc
+++ b/chrome/common/chrome_paths_linux.cc
@@ -101,10 +101,6 @@ bool GetUserDownloadsDirectory(FilePath* result) {
// 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) {
-#if defined(OS_CHROMEOS)
- // No local Pictures directory on CrOS.
- return false;
-#else
*result = GetXDGUserDirectory("PICTURES", kPicturesDir);
FilePath home = file_util::GetHomeDir();
@@ -118,7 +114,6 @@ bool GetUserPicturesDirectory(FilePath* result) {
*result = home.Append(kPicturesDir);
return true;
-#endif
}
bool GetUserDesktop(FilePath* result) {