diff options
author | haraken@google.com <haraken@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-24 18:39:12 +0000 |
---|---|---|
committer | haraken@google.com <haraken@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-24 18:39:12 +0000 |
commit | f44f0a822af7153715776df850d43e7dee4b44ba (patch) | |
tree | 2edd15ceb2430e075f9b2f3384af95b6c3d1550f /chrome/browser/platform_util_common_linux.cc | |
parent | a920effbdf6a9bccff256c2e6396ed7ddf4e5b0a (diff) | |
download | chromium_src-f44f0a822af7153715776df850d43e7dee4b44ba.zip chromium_src-f44f0a822af7153715776df850d43e7dee4b44ba.tar.gz chromium_src-f44f0a822af7153715776df850d43e7dee4b44ba.tar.bz2 |
Move GetVersionStringModifier() and GetChannel() from platform_util_* to chrome_version_info_*
BUG=37186
TEST=No behavior change. Manually confirm that build succeeds on Linux, Mac and Windows if we comment out '#if defined(GOOGLE_CHROME_BUILD)' in chrome_version_info_*.
Review URL: http://codereview.chromium.org/7249003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90394 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/platform_util_common_linux.cc')
-rw-r--r-- | chrome/browser/platform_util_common_linux.cc | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/chrome/browser/platform_util_common_linux.cc b/chrome/browser/platform_util_common_linux.cc index 35e541f..8b8be92 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; } |