Do not rely on XDG_CURRENT_DESKTOP only when testing for Unity.

Do not rely on XDG_CURRENT_DESKTOP only when testing for Unity.

gnome-fallback sessions set XDG_CURRENT_DESKTOP to Unity,
DESKTOP_SESSION needs to be tested as well.

BUG=

Committed: https://crrev.com/0f4b476f784b12495f3e0e53d63fec1ad621c0c1
Cr-Commit-Position: refs/heads/master@{#294381}

[joleksy, 2014-09-09 09:09:17]

joleksy@opera.com changed reviewers:
+ willchan@chromium.org

[joleksy, 2014-09-09 09:09:35]

@reviewer: does it look ok to you?

[willchan no longer on Chromium, 2014-09-10 00:04:00]

FYI my status says I'm OOO until March next year.
On Sep 9, 2014 3:09 AM, <joleksy@opera.com> wrote:

> Reviewers: willchan OOO until 03-22-15,
>
> Message:
> @reviewer: does it look ok to you?
>
> Description:
> Do not rely on XDG_CURRENT_DESKTOP only when testing for Unity.
>
> gnome-fallback sessions set XDG_CURRENT_DESKTOP to Unity,
> DESKTOP_SESSION needs to be tested as well.
>
> BUG=
>
> Please review this at https://codereview.chromium.org/550173006/
>
> SVN Base: https://chromium.googlesource.com/chromium/src.git@master
>
> Affected files (+10, -2 lines):
>   M base/nix/xdg_util.cc
>
>
> Index: base/nix/xdg_util.cc
> diff --git a/base/nix/xdg_util.cc b/base/nix/xdg_util.cc
> index e889b5681a035b987ecf9e9118a5dece378cc0f3..
> e2a48d4b938f0b6827527d8a2ec55b2519a118a2 100644
> --- a/base/nix/xdg_util.cc
> +++ b/base/nix/xdg_util.cc
> @@ -57,10 +57,18 @@ DesktopEnvironment GetDesktopEnvironment(Environment*
> env) {
>    std::string xdg_current_desktop;
>    if (env->GetVar("XDG_CURRENT_DESKTOP", &xdg_current_desktop)) {
>      // Not all desktop environments set this env var as of this writing.
> -    if (xdg_current_desktop == "Unity")
> +    if (xdg_current_desktop == "Unity") {
> +      // gnome-fallback sessions set XDG_CURRENT_DESKTOP to Unity
> +      // DESKTOP_SESSION can be gnome-fallback or gnome-fallback-compiz
> +      std::string desktop_session;
> +      if (env->GetVar("DESKTOP_SESSION", &desktop_session) &&
> +          desktop_session.find("gnome-fallback") != std::string::npos) {
> +        return DESKTOP_ENVIRONMENT_GNOME;
> +      }
>        return DESKTOP_ENVIRONMENT_UNITY;
> -    else if (xdg_current_desktop == "GNOME")
> +    } else if (xdg_current_desktop == "GNOME") {
>        return DESKTOP_ENVIRONMENT_GNOME;
> +    }
>    }
>
>    // DESKTOP_SESSION was what everyone used in 2010.
>
>
>

To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

[joleksy, 2014-09-10 06:22:18]

joleksy@opera.com changed reviewers:
+ erg@chromium.org

[joleksy, 2014-09-10 06:22:39]

@reviewer: does it look ok to you?

[Elliot Glaysher, 2014-09-10 17:42:53]

lgtm, but I'm not an OWNER on base/.

[joleksy, 2014-09-11 06:51:20]

joleksy@opera.com changed reviewers:
+ mark@chromium.org

[joleksy, 2014-09-11 06:51:47]

On 2014/09/10 17:42:53, Elliot Glaysher wrote:
> lgtm, but I'm not an OWNER on base/.

Added mark@chromium.org.

[Mark Mentovai, 2014-09-11 12:39:10]

LGTM.

[joleksy, 2014-09-11 12:41:06]

The CQ bit was checked by joleksy@opera.com

[commit-bot: I haz the power, 2014-09-11 12:41:27]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patchset/550173006/1

[commit-bot: I haz the power, 2014-09-11 13:42:26]

Committed patchset #1 (id:1) as b76ee274f9178c148dea27eab3901e555dfe147c

[commit-bot: I haz the power, 2014-09-11 13:45:39]

Patchset 1 (id:??) landed as
https://crrev.com/0f4b476f784b12495f3e0e53d63fec1ad621c0c1
Cr-Commit-Position: refs/heads/master@{#294381}