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

Unified Diff: chrome/common/chrome_version_info_posix.cc

Issue 145643006: Linux: enable SxS (side-by-side) support (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes 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 | « chrome/browser/shell_integration_linux.cc ('k') | chrome/installer/linux/debian/build.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/chrome_version_info_posix.cc
diff --git a/chrome/common/chrome_version_info_posix.cc b/chrome/common/chrome_version_info_posix.cc
index ebf67a0faa7abc6ff4c5399563ad07b56d3c99d5..a243b07416409bdd31ca637f5b175ec17c597fb2 100644
--- a/chrome/common/chrome_version_info_posix.cc
+++ b/chrome/common/chrome_version_info_posix.cc
@@ -4,6 +4,7 @@
#include "chrome/common/chrome_version_info.h"
+#include "base/strings/string_util.h"
#include "build/build_config.h"
namespace chrome {
@@ -44,13 +45,15 @@ std::string VersionInfo::GetVersionStringModifier() {
VersionInfo::Channel VersionInfo::GetChannel() {
#if defined(GOOGLE_CHROME_BUILD)
std::string channel = GetVersionStringModifier();
+ // There might be suffixes after channel name (e.g. "aura"), so match just
+ // the beginning of version string modifier.
if (channel.empty()) {
return CHANNEL_STABLE;
- } else if (channel == "beta") {
+ } else if (StartsWithASCII(channel, "beta ", true)) {
return CHANNEL_BETA;
- } else if (channel == "dev") {
+ } else if (StartsWithASCII(channel, "dev ", true)) {
return CHANNEL_DEV;
- } else if (channel == "canary") {
+ } else if (StartsWithASCII(channel, "canary ", true)) {
return CHANNEL_CANARY;
}
#endif
« no previous file with comments | « chrome/browser/shell_integration_linux.cc ('k') | chrome/installer/linux/debian/build.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698