Revert of Linux: Sync GetDesktopName in gtk2_util.cc

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>
 
 #include <memory>
 
 #include "base/command_line.h"
 #include "base/debug/leak_annotations.h"
 #include "base/environment.h"
-#include "chrome/common/channel_info.h"
-#include "components/version_info/version_info.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/keycodes/keyboard_code_conversion_x.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace {
 
 const char kAuraTransientParent[] = "aura-transient-parent";
@@ skipping 22 matching lines @@
 }
 
 }  // namespace
 
 namespace libgtk2ui {
 
 void GtkInitFromCommandLine(const base::CommandLine& command_line) {
   CommonInitFromCommandLine(command_line, gtk_init);
 }
 
-// This function should be kept in sync with the copy in
-// shell_integration_linux.cc.
-//
-// Because of how libgtk2ui.so is structured as a stand alone .so, we can't call
-// code from browser and above.
+// TODO(erg): This method was copied out of shell_integration_linux.cc. Because
+// 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)
-  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";
-  }
+  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