summaryrefslogtreecommitdiffstats
path: root/chrome/browser/shell_integration_linux.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-03 21:48:39 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-03 21:48:39 +0000
commit6d43c8470811db524da4b2f3a364cc0aa5631f4f (patch)
tree5b5571267fb674e9a98118f0c3d4e2366425ed3b /chrome/browser/shell_integration_linux.cc
parent23ba42178d629d5d4fe6bbfbbee847a3ddf546b9 (diff)
downloadchromium_src-6d43c8470811db524da4b2f3a364cc0aa5631f4f.zip
chromium_src-6d43c8470811db524da4b2f3a364cc0aa5631f4f.tar.gz
chromium_src-6d43c8470811db524da4b2f3a364cc0aa5631f4f.tar.bz2
Linux: fix .desktop file lookup ("again").
BUG=303878 R=erg@chromium.org Review URL: https://codereview.chromium.org/25737008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226856 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/shell_integration_linux.cc')
-rw-r--r--chrome/browser/shell_integration_linux.cc11
1 files changed, 1 insertions, 10 deletions
diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc
index 104cc31..f72b63d 100644
--- a/chrome/browser/shell_integration_linux.cc
+++ b/chrome/browser/shell_integration_linux.cc
@@ -558,16 +558,7 @@ std::string GetProgramClassName() {
std::string GetDesktopName(base::Environment* env) {
#if defined(GOOGLE_CHROME_BUILD)
- chrome::VersionInfo::Channel product_channel(
- chrome::VersionInfo::GetChannel());
- switch (product_channel) {
- case chrome::VersionInfo::CHANNEL_DEV:
- return "google-chrome-unstable.desktop";
- case chrome::VersionInfo::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