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

Unified Diff: chrome/browser/platform_util_common_linux.cc

Issue 7249003: Move GetVersionStringModifier() and GetChannel() from platform_util_* to chrome_version_info_* (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: correct nits Created 9 years, 6 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/platform_util.h ('k') | chrome/browser/platform_util_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/platform_util_common_linux.cc
diff --git a/chrome/browser/platform_util_common_linux.cc b/chrome/browser/platform_util_common_linux.cc
index 35e541fa6d0a8d3072825d49b05269974178364a..8b8be92bc81081df7ad3a21b0461fcf4bfe3d548 100644
--- a/chrome/browser/platform_util_common_linux.cc
+++ b/chrome/browser/platform_util_common_linux.cc
@@ -113,47 +113,6 @@ bool SimpleYesNoBox(gfx::NativeWindow parent,
return g_dialog_response == GTK_RESPONSE_YES;
}
-// Warning: this may be either Linux or ChromeOS.
-std::string GetVersionStringModifier() {
- char* env = getenv("CHROME_VERSION_EXTRA");
- if (!env)
- return std::string();
- std::string modifier(env);
-
-#if defined(GOOGLE_CHROME_BUILD)
- // Only ever return "", "unknown", "dev" or "beta" in a branded build.
- if (modifier == "unstable") // linux version of "dev"
- modifier = "dev";
- if (modifier == "stable") {
- modifier = "";
- } else if ((modifier == "dev") || (modifier == "beta")) {
- // do nothing.
- } else {
- modifier = "unknown";
- }
-#endif
-
- return modifier;
-}
-
-// Warning: this may be either Linux or ChromeOS.
-Channel GetChannel() {
-#if defined(GOOGLE_CHROME_BUILD)
- std::string channel = GetVersionStringModifier();
- if (channel.empty()) {
- return CHANNEL_STABLE;
- } else if (channel == "beta") {
- return CHANNEL_BETA;
- } else if (channel == "dev") {
- return CHANNEL_DEV;
- } else if (channel == "canary") {
- return CHANNEL_CANARY;
- }
-#endif
-
- return CHANNEL_UNKNOWN;
-}
-
bool CanSetAsDefaultBrowser() {
return true;
}
« no previous file with comments | « chrome/browser/platform_util.h ('k') | chrome/browser/platform_util_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698