GTK: Possible WM_CLASS fix.

chrome/browser/ui/gtk/browser_window_gtk.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include <dlfcn.h>
 #include <string>
@@ skipping 278 matching lines @@
   }
   gtk_window_resize(window, new_size.width(), new_size.height());
 }
 
 GQuark GetBrowserWindowQuarkKey() {
   static GQuark quark = g_quark_from_static_string(kBrowserWindowKey);
   return quark;
 }
 
 // Set a custom WM_CLASS for a window.
-// This would normally be a simple gtk_window_set_wmclass call but we have
-// an XFCE workaround.
 void SetWindowCustomClass(GtkWindow* window, const std::string& wmclass) {
-  scoped_ptr<base::Environment> env(base::Environment::Create());
-  if (base::nix::GetDesktopEnvironment(env.get()) ==
-      base::nix::DESKTOP_ENVIRONMENT_XFCE) {
-    // Workaround for XFCE. XFCE seems to treat the class as a user
-    // displayed title, which our app name certainly isn't. They don't have
-    // a dock or application based behaviour so do what looks good.
-    gtk_window_set_wmclass(window,
-                           wmclass.c_str(),
-                           gdk_get_program_class());
-  } else {
-    // Most everything else uses the wmclass_class to group windows
-    // together (docks, per application stuff, etc). Hopefully they won't
-    // display wmclassname to the user.
-    gtk_window_set_wmclass(window,
-                           g_get_prgname(),
-                           wmclass.c_str());
-  }
+  gtk_window_set_wmclass(window,
+                         wmclass.c_str(),
+                         gdk_get_program_class());
 
   // Set WM_WINDOW_ROLE for session management purposes.
   // See http://tronche.com/gui/x/icccm/sec-5.html .
   gtk_window_set_role(window, wmclass.c_str());
 }
 
 }  // namespace
 
 std::map<XID, GtkWindow*> BrowserWindowGtk::xid_map_;
 
@@ skipping 2061 matching lines @@
   // are taken from the WMs' source code.
   return (wm_name == "Blackbox" ||
           wm_name == "compiz" ||
           wm_name == "Compiz" ||
           wm_name == "e16" ||  // Enlightenment DR16
           wm_name == "Metacity" ||
           wm_name == "Mutter" ||
           wm_name == "Openbox" ||
           wm_name == "Xfwm4");
 }