Linux: Support the --class argument (Reland)

chrome/browser/ui/libgtk2ui/gtk2_util.cc

 // Copyright (c) 2012 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/libgtk2ui/gtk2_util.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 #include <stddef.h>
@@ skipping 38 matching lines @@
 }
 
 }  // namespace
 
 namespace libgtk2ui {
 
 void GtkInitFromCommandLine(const base::CommandLine& command_line) {
   CommonInitFromCommandLine(command_line, gtk_init);
 }
 
 // TODO(erg): This method was copied out of shell_integration_linux.cc. Because

[Lei Zhang, 2016/07/28 21:28:46]

Any chance we can deal with this TODO here? I'm annoyed the two copies of
GetDesktopName() has gotten out of sync. At the minimunm, we should add comments
in both places to say they should stay in sync.

 // of how this library is structured as a stand alone .so, we can't call code
 // from browser and above.
 std::string GetDesktopName(base::Environment* env) {
 #if defined(GOOGLE_CHROME_BUILD)
-  return "google-chrome.desktop";
+  version_info::Channel product_channel(chrome::GetChannel());
+  switch (product_channel) {
+    case version_info::Channel::DEV:
+      return "google-chrome-unstable.desktop";
+    case version_info::Channel::BETA:
+      return "google-chrome-beta.desktop";
+    default:
+      return "google-chrome.desktop";
+  }
 #else  // CHROMIUM_BUILD
   // Allow $CHROME_DESKTOP to override the built-in value, so that development
   // versions can set themselves as the default without interfering with
   // non-official, packaged versions using the built-in value.
   std::string name;
   if (env->GetVar("CHROME_DESKTOP", &name) && !name.empty())
     return name;
   return "chromium-browser.desktop";
 #endif
 }
@@ skipping 60 matching lines @@
 aura::Window* GetAuraTransientParent(GtkWidget* dialog) {
   return reinterpret_cast<aura::Window*>(
       g_object_get_data(G_OBJECT(dialog), kAuraTransientParent));
 }
 
 void ClearAuraTransientParent(GtkWidget* dialog) {
   g_object_set_data(G_OBJECT(dialog), kAuraTransientParent, NULL);
 }
 
 }  // namespace libgtk2ui