Linux: Use GConfTitlebarListener on Unity or when the WM is Metacity.

chrome/browser/ui/gtk/gconf_titlebar_listener.cc

Index: chrome/browser/ui/gtk/gconf_titlebar_listener.cc
===================================================================
--- chrome/browser/ui/gtk/gconf_titlebar_listener.cc	(revision 153936)
+++ chrome/browser/ui/gtk/gconf_titlebar_listener.cc	(working copy)
@@ -11,6 +11,7 @@
 #include "base/memory/singleton.h"
 #include "base/nix/xdg_util.h"
 #include "chrome/browser/ui/gtk/browser_titlebar.h"
+#include "ui/base/x/x11_util.h"
 
 namespace {
 
@@ -52,8 +53,11 @@
 
 GConfTitlebarListener::GConfTitlebarListener() : client_(NULL) {
   scoped_ptr<base::Environment> env(base::Environment::Create());
-  if (base::nix::GetDesktopEnvironment(env.get()) ==
-      base::nix::DESKTOP_ENVIRONMENT_GNOME) {
+  base::nix::DesktopEnvironment de =
+      base::nix::GetDesktopEnvironment(env.get());
+  if (de == base::nix::DESKTOP_ENVIRONMENT_GNOME ||
+      de == base::nix::DESKTOP_ENVIRONMENT_UNITY ||
+      ui::GuessWindowManager() == ui::WM_METACITY) {
     client_ = gconf_client_get_default();
     // If we fail to get a context, that's OK, since we'll just fallback on
     // not receiving gconf keys.