diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-17 23:40:17 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-17 23:40:17 +0000 |
| commit | 9e6c9bde9a6014b1cb703d064acfb5c07462f272 (patch) | |
| tree | 4c7103c1eb326ca189008bb86a6e8b8558f2d666 /media/audio | |
| parent | 30a10dcfc0b5935a43557719cb19767419d4de13 (diff) | |
| download | chromium_src-9e6c9bde9a6014b1cb703d064acfb5c07462f272.zip chromium_src-9e6c9bde9a6014b1cb703d064acfb5c07462f272.tar.gz chromium_src-9e6c9bde9a6014b1cb703d064acfb5c07462f272.tar.bz2 | |
Linux: Detect Unity as a desktop environment.
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10735034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147134 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio')
| -rw-r--r-- | media/audio/linux/audio_manager_linux.cc | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/media/audio/linux/audio_manager_linux.cc b/media/audio/linux/audio_manager_linux.cc index 8a8cad2..9d9e833 100644 --- a/media/audio/linux/audio_manager_linux.cc +++ b/media/audio/linux/audio_manager_linux.cc @@ -72,11 +72,20 @@ void AudioManagerLinux::UnMuteAll() { bool AudioManagerLinux::CanShowAudioInputSettings() { scoped_ptr<base::Environment> env(base::Environment::Create()); - base::nix::DesktopEnvironment desktop = base::nix::GetDesktopEnvironment( - env.get()); - return (desktop == base::nix::DESKTOP_ENVIRONMENT_GNOME || - desktop == base::nix::DESKTOP_ENVIRONMENT_KDE3 || - desktop == base::nix::DESKTOP_ENVIRONMENT_KDE4); + + switch (base::nix::GetDesktopEnvironment(env.get())) { + case base::nix::DESKTOP_ENVIRONMENT_GNOME: + case base::nix::DESKTOP_ENVIRONMENT_KDE3: + case base::nix::DESKTOP_ENVIRONMENT_KDE4: + return true; + case base::nix::DESKTOP_ENVIRONMENT_OTHER: + case base::nix::DESKTOP_ENVIRONMENT_UNITY: + case base::nix::DESKTOP_ENVIRONMENT_XFCE: + return false; + } + // Unless GetDesktopEnvironment() badly misbehaves, this should never happen. + NOTREACHED(); + return false; } void AudioManagerLinux::ShowAudioInputSettings() { |