Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(98)

Unified Diff: chrome/browser/shell_integration_linux.cc

Issue 145643006: Linux: enable SxS (side-by-side) support (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/common/chrome_version_info_posix.cc » ('j') | chrome/installer/linux/debian/build.sh » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/shell_integration_linux.cc
diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc
index 237e3f2ffb9da81679710b75652069bbbce3d3a7..e92a5a588183243bd05b6e21a58e97a4b77be74e 100644
--- a/chrome/browser/shell_integration_linux.cc
+++ b/chrome/browser/shell_integration_linux.cc
@@ -38,6 +38,7 @@
#include "build/build_config.h"
#include "chrome/browser/web_applications/web_app.h"
#include "chrome/common/chrome_constants.h"
+#include "chrome/common/chrome_version_info.h"
Lei Zhang 2014/01/23 21:31:30 already #included 2 lines below.
Paweł Hajdan Jr. 2014/01/29 19:03:23 Done.
#include "chrome/common/chrome_switches.h"
#include "chrome/common/chrome_version_info.h"
#include "content/public/browser/browser_thread.h"
@@ -585,7 +586,16 @@ std::string GetProgramClassName() {
std::string GetDesktopName(base::Environment* env) {
#if defined(GOOGLE_CHROME_BUILD)
- return "google-chrome.desktop";
+ 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";
+ }
#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
« no previous file with comments | « no previous file | chrome/common/chrome_version_info_posix.cc » ('j') | chrome/installer/linux/debian/build.sh » ('J')

Powered by Google App Engine
This is Rietveld 408576698