diff options
author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-18 00:34:56 +0000 |
---|---|---|
committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-18 00:34:56 +0000 |
commit | 200e80dc6a93fa165551590e9cb1ba589ec0958e (patch) | |
tree | c5c878f63eadd0c8e1d6477570a6b37d1bb0b819 /base | |
parent | d4c755d3917ec20b811d4b868c18cb40cae6713b (diff) | |
download | chromium_src-200e80dc6a93fa165551590e9cb1ba589ec0958e.zip chromium_src-200e80dc6a93fa165551590e9cb1ba589ec0958e.tar.gz chromium_src-200e80dc6a93fa165551590e9cb1ba589ec0958e.tar.bz2 |
Revert "Add proxy config (using gnome-network-preferences)"
This reverts commit d06bc0c855b1e81e36c7bfc9bef342eb358d99a5.
TBR=estade
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21033 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r-- | base/linux_util.cc | 10 | ||||
-rw-r--r-- | base/linux_util.h | 6 |
2 files changed, 0 insertions, 16 deletions
diff --git a/base/linux_util.cc b/base/linux_util.cc index d8b36ed..604980b 100644 --- a/base/linux_util.cc +++ b/base/linux_util.cc @@ -59,14 +59,4 @@ std::string GetLinuxDistro() { return linux_distro; } -bool UseGnomeForSettings() { - // GNOME_DESKTOP_SESSION_ID being defined is a good indication that - // we are probably running under GNOME. - // Note: KDE_FULL_SESSION is a corresponding env var to recognize KDE. - char* desktop_session; - return (getenv("GNOME_DESKTOP_SESSION_ID") || - ((desktop_session = getenv("DESKTOP_SESSION")) && - std::string(desktop_session) == "gnome")); -} - } // namespace base diff --git a/base/linux_util.h b/base/linux_util.h index 75b4ad4..973a2b0 100644 --- a/base/linux_util.h +++ b/base/linux_util.h @@ -20,12 +20,6 @@ uint8_t* BGRAToRGBA(const uint8_t* pixels, int width, int height, int stride); // GetWinVersion() in base/win_util.h. std::string GetLinuxDistro(); -// Return true if we appear to be running under Gnome and should attempt to use -// some prefrences from the desktop environment (eg proxy settings), -// If someone adds support for other environments, this function could be -// replaced with one that returns an enum so we an specify Gnome, KDE, etc. -bool UseGnomeForSettings(); - } // namespace base #endif // BASE_LINUX_UTIL_H__ |