Merge 82581 - GTK: Set WMCLASS in a way docks notice while still solving display issues on XFCE.B...

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>
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
+#include "base/environment.h"
 #include "base/i18n/file_util_icu.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
+#include "base/nix/xdg_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/download/download_item_model.h"
@@ skipping 288 matching lines @@
 
   // Add this window to its own unique window group to allow for
   // window-to-parent modality.
   gtk_window_group_add_window(gtk_window_group_new(), window_);
   g_object_unref(gtk_window_get_group(window_));
 
   if (browser_->type() & Browser::TYPE_APP) {
     std::string app_name = browser_->app_name();
     if (app_name != DevToolsWindow::kDevToolsApp) {
       std::string wmclassname = web_app::GetWMClassFromAppName(app_name);
-      gtk_window_set_wmclass(window_,
-                             wmclassname.c_str(),
-                             gdk_get_program_class());
+
+      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_,
+                               wmclassname.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_,
+                               window_->wmclass_name,
+                               wmclassname.c_str());
+      }
+
+      gtk_window_set_role(window_, wmclassname.c_str());
     }
   }
 
   // For popups, we initialize widgets then set the window geometry, because
   // popups need the widgets inited before they can set the window size
   // properly. For other windows, we set the geometry first to prevent resize
   // flicker.
   if (browser_->type() & Browser::TYPE_POPUP) {
     InitWidgets();
     SetGeometryHints();
@@ skipping 1988 matching lines @@
   // special-case the ones where the custom frame should be used.  These names
   // are taken from the WMs' source code.
   return (wm_name == "Blackbox" ||
           wm_name == "compiz" ||
           wm_name == "e16" ||  // Enlightenment DR16
           wm_name == "Metacity" ||
           wm_name == "Mutter" ||
           wm_name == "Openbox" ||
           wm_name == "Xfwm4");
 }