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

Unified Diff: base/linux_util.h

Issue 1701005: bsd: refactor XDG bits of linux_util into a shared file. (Closed)
Patch Set: Created 10 years, 8 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: base/linux_util.h
diff --git a/base/linux_util.h b/base/linux_util.h
index 1458cfbcf6a62867bd37e920e624d41be94970f0..2550f70ebde43b3e4bdc0dcc5def9a6a7a3b8eb5 100644
--- a/base/linux_util.h
+++ b/base/linux_util.h
@@ -27,45 +27,6 @@ uint8_t* BGRAToRGBA(const uint8_t* pixels, int width, int height, int stride);
// GetWinVersion() in base/win_util.h.
std::string GetLinuxDistro();
-// Get the home directory.
-FilePath GetHomeDir(EnvVarGetter* env);
-
-// Utility function for getting XDG directories.
-// |env_name| is the name of an environment variable that we want to use to get
-// a directory path. |fallback_dir| is the directory relative to $HOME that we
-// use if |env_name| cannot be found or is empty. |fallback_dir| may be NULL.
-// Examples of |env_name| are XDG_CONFIG_HOME and XDG_DATA_HOME.
-FilePath GetXDGDirectory(EnvVarGetter* env, const char* env_name,
- const char* fallback_dir);
-
-// Wrapper around xdg_user_dir_lookup() from src/base/third_party/xdg-user-dirs
-// This looks up "well known" user directories like the desktop and music
-// folder. Examples of |dir_name| are DESKTOP and MUSIC.
-FilePath GetXDGUserDirectory(EnvVarGetter* env, const char* dir_name,
- const char* fallback_dir);
-
-enum DesktopEnvironment {
- DESKTOP_ENVIRONMENT_OTHER,
- DESKTOP_ENVIRONMENT_GNOME,
- // KDE3 and KDE4 are sufficiently different that we count
- // them as two different desktop environments here.
- DESKTOP_ENVIRONMENT_KDE3,
- DESKTOP_ENVIRONMENT_KDE4,
- DESKTOP_ENVIRONMENT_XFCE,
-};
-
-// Return an entry from the DesktopEnvironment enum with a best guess
-// of which desktop environment we're using. We use this to know when
-// to attempt to use preferences from the desktop environment --
-// proxy settings, password manager, etc.
-DesktopEnvironment GetDesktopEnvironment(EnvVarGetter* env);
-
-// Return a string representation of the given desktop environment.
-// May return NULL in the case of DESKTOP_ENVIRONMENT_OTHER.
-const char* GetDesktopEnvironmentName(DesktopEnvironment env);
-// Convenience wrapper that calls GetDesktopEnvironment() first.
-const char* GetDesktopEnvironmentName(EnvVarGetter* env);
-
// Return the inode number for the UNIX domain socket |fd|.
bool FileDescriptorGetInode(ino_t* inode_out, int fd);

Powered by Google App Engine
This is Rietveld 408576698