diff options
| author | mdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-20 23:14:57 +0000 |
|---|---|---|
| committer | mdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-20 23:14:57 +0000 |
| commit | c85cfbd98c6bf26e730fdd15538c624cb52352e9 (patch) | |
| tree | 55c7af76f8cfcd1cccee33ebdc5e087543d938fc /base/linux_util.h | |
| parent | 11783f0ab7285b59c4fd40c42bbbf74fcea916e4 (diff) | |
| download | chromium_src-c85cfbd98c6bf26e730fdd15538c624cb52352e9.zip chromium_src-c85cfbd98c6bf26e730fdd15538c624cb52352e9.tar.gz chromium_src-c85cfbd98c6bf26e730fdd15538c624cb52352e9.tar.bz2 | |
Linux: make the "change proxy settings" button able to start several proxy config utilities.
Currently it still only ever starts gnome-network-properties but it is now easy to update.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/174106
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23910 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/linux_util.h')
| -rw-r--r-- | base/linux_util.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/base/linux_util.h b/base/linux_util.h index 693377c..4cfa9da 100644 --- a/base/linux_util.h +++ b/base/linux_util.h @@ -35,7 +35,10 @@ class EnvironmentVariableGetter { enum DesktopEnvironment { DESKTOP_ENVIRONMENT_OTHER, DESKTOP_ENVIRONMENT_GNOME, - DESKTOP_ENVIRONMENT_KDE, + // KDE3 and KDE4 are sufficiently different that we count + // them as two different desktop environments here. + DESKTOP_ENVIRONMENT_KDE3, + DESKTOP_ENVIRONMENT_KDE4, }; // Return an entry from the DesktopEnvironment enum with a best guess @@ -44,6 +47,12 @@ enum DesktopEnvironment { // proxy settings, password manager, etc. DesktopEnvironment GetDesktopEnvironment(EnvironmentVariableGetter* 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(EnvironmentVariableGetter* env); + } // namespace base #endif // BASE_LINUX_UTIL_H__ |