Merge 82672 - GTK: Fix valgrind errors in previous wmclass patch.(Can't actually read that field;...

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 323 matching lines @@
         // 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,
+                               g_get_prgname(),
                                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
@@ skipping 1992 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");
 }