diff options
| author | huanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-28 16:50:49 +0000 |
|---|---|---|
| committer | huanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-28 16:50:49 +0000 |
| commit | e04336f9d582160d5a72f9f12a8d192b2922b3b6 (patch) | |
| tree | a83266e2a693cd813aca9573b9d8d4472d5a3599 /chrome/installer | |
| parent | 2a9778a982044e573730d6c3e16ad8a47f0bc512 (diff) | |
| download | chromium_src-e04336f9d582160d5a72f9f12a8d192b2922b3b6.zip chromium_src-e04336f9d582160d5a72f9f12a8d192b2922b3b6.tar.gz chromium_src-e04336f9d582160d5a72f9f12a8d192b2922b3b6.tar.bz2 | |
Separate version env variable for different distributions.
BUG=26819
Review URL: http://codereview.chromium.org/2339001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48495 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
5 files changed, 13 insertions, 1 deletions
diff --git a/chrome/installer/util/browser_distribution.cc b/chrome/installer/util/browser_distribution.cc index 21cdac5..9f53be3 100644 --- a/chrome/installer/util/browser_distribution.cc +++ b/chrome/installer/util/browser_distribution.cc @@ -135,7 +135,7 @@ std::wstring BrowserDistribution::GetVersionKey() { } std::wstring BrowserDistribution::GetEnvVersionKey() { - return L"CHROME_VERSION"; + return L"CHROMIUM_VERSION"; } bool BrowserDistribution::CanSetAsDefault() { diff --git a/chrome/installer/util/chrome_frame_distribution.cc b/chrome/installer/util/chrome_frame_distribution.cc index 0c8d960..a8f120f 100644 --- a/chrome/installer/util/chrome_frame_distribution.cc +++ b/chrome/installer/util/chrome_frame_distribution.cc @@ -97,6 +97,10 @@ std::wstring ChromeFrameDistribution::GetVersionKey() { return key; } +std::wstring ChromeFrameDistribution::GetEnvVersionKey() { + return L"CHROME_FRAME_VERSION"; +} + bool ChromeFrameDistribution::CanSetAsDefault() { return false; } diff --git a/chrome/installer/util/chrome_frame_distribution.h b/chrome/installer/util/chrome_frame_distribution.h index 650c3d2..0b3bda4e 100644 --- a/chrome/installer/util/chrome_frame_distribution.h +++ b/chrome/installer/util/chrome_frame_distribution.h @@ -43,6 +43,8 @@ class ChromeFrameDistribution : public BrowserDistribution { virtual std::wstring GetVersionKey(); + virtual std::wstring GetEnvVersionKey(); + virtual bool CanSetAsDefault(); // This is the point at which the Google Chrome installer removes the Google diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc index 814eeb0..b1b22df 100644 --- a/chrome/installer/util/google_chrome_distribution.cc +++ b/chrome/installer/util/google_chrome_distribution.cc @@ -479,6 +479,10 @@ std::wstring GoogleChromeDistribution::GetVersionKey() { return key; } +std::wstring GoogleChromeDistribution::GetEnvVersionKey() { + return L"CHROME_VERSION"; +} + // This method checks if we need to change "ap" key in Google Update to try // full installer as fall back method in case incremental installer fails. // - If incremental installer fails we append a magic string ("-full"), if diff --git a/chrome/installer/util/google_chrome_distribution.h b/chrome/installer/util/google_chrome_distribution.h index 0af7e3f..fec4df2 100644 --- a/chrome/installer/util/google_chrome_distribution.h +++ b/chrome/installer/util/google_chrome_distribution.h @@ -76,6 +76,8 @@ class GoogleChromeDistribution : public BrowserDistribution { virtual std::wstring GetVersionKey(); + virtual std::wstring GetEnvVersionKey(); + virtual void UpdateDiffInstallStatus(bool system_install, bool incremental_install, installer_util::InstallStatus install_status); |