Add the calculated WMClass to generated .desktop files.

chrome/browser/shell_integration_linux.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/shell_integration.h"
 
 #include <fcntl.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ skipping 11 matching lines @@
 #include "base/memory/scoped_temp_dir.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "base/task.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
 #include "ui/gfx/codec/png_codec.h"
 
 namespace {
 
 // Helper to launch xdg scripts. We don't want them to ask any questions on the
 // terminal etc.
@@ skipping 311 matching lines @@
     } else {
       return FilePath(alternative_filepath).BaseName();
     }
   }
 
   return FilePath();
 }
 
 // static
 std::string ShellIntegration::GetDesktopFileContents(
-    const std::string& template_contents, const GURL& url,
-    const std::string& extension_id, const string16& title,
+    const std::string& template_contents,
+    const std::string& app_name,
+    const GURL& url,
+    const std::string& extension_id,
+    const string16& title,
     const std::string& icon_name) {
   // See http://standards.freedesktop.org/desktop-entry-spec/latest/
   // Although not required by the spec, Nautilus on Ubuntu Karmic creates its
   // launchers with an xdg-open shebang. Follow that convention.
   std::string output_buffer("#!/usr/bin/env xdg-open\n");
   StringTokenizer tokenizer(template_contents, "\n");
   while (tokenizer.GetNext()) {
     if (tokenizer.token().substr(0, 5) == "Exec=") {
       std::string exec_path = tokenizer.token().substr(5);
       StringTokenizer exec_tokenizer(exec_path, " ");
@@ skipping 28 matching lines @@
         final_title = url.spec();
       }
       output_buffer += StringPrintf("Name=%s\n", final_title.c_str());
     } else if (tokenizer.token().substr(0, 11) == "GenericName" ||
                tokenizer.token().substr(0, 7) == "Comment" ||
                tokenizer.token().substr(0, 1) == "#") {
       // Skip comment lines.
     } else if (tokenizer.token().substr(0, 9) == "MimeType=") {
       // Skip MimeType lines, they are only relevant for a web browser
       // shortcut, not a web application shortcut.
+    } else if (tokenizer.token().substr(0, 15) == "StartupWMClass=") {
+      // Skip StartupWMClass; it will cerrtainly be wrong since we emit a

[Evan Stade, 2011/04/05 21:12:08]

certainly

+      // different one based on the app name below.
     } else if (tokenizer.token().substr(0, 5) == "Icon=" &&
                !icon_name.empty()) {
       output_buffer += StringPrintf("Icon=%s\n", icon_name.c_str());
     } else {
       output_buffer += tokenizer.token() + "\n";
     }
   }
+
+  output_buffer += "StartupWMClass=";

[Evan Stade, 2011/04/05 21:12:08]

I'd slightly prefer

  output_buffer += foo + bar + baz;

+  output_buffer += web_app::GetWMClassFromAppName(app_name);
+  output_buffer += "\n";
+
   return output_buffer;
 }
 
 // static
 void ShellIntegration::CreateDesktopShortcut(
     const ShortcutInfo& shortcut_info, const std::string& shortcut_template) {
   // TODO(phajdan.jr): Report errors from this function, possibly as infobars.
 
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   FilePath shortcut_filename = GetDesktopShortcutFilename(shortcut_info.url);
   if (shortcut_filename.empty())
     return;
 
   std::string icon_name = CreateShortcutIcon(shortcut_info, shortcut_filename);
 
+  std::string app_name =
+      web_app::GenerateApplicationNameFromInfo(shortcut_info);
   std::string contents = GetDesktopFileContents(
-      shortcut_template, shortcut_info.url, shortcut_info.extension_id,
-      shortcut_info.title, icon_name);
+      shortcut_template,
+      app_name,
+      shortcut_info.url,
+      shortcut_info.extension_id,
+      shortcut_info.title,
+      icon_name);
 
   if (shortcut_info.create_on_desktop)
     CreateShortcutOnDesktop(shortcut_filename, contents);
 
   if (shortcut_info.create_in_applications_menu)
     CreateShortcutInApplicationsMenu(shortcut_filename, contents);
 }