diff options
Diffstat (limited to 'chrome/installer')
9 files changed, 0 insertions, 28 deletions
diff --git a/chrome/installer/util/browser_distribution.cc b/chrome/installer/util/browser_distribution.cc index 232c434..1a82cf5 100644 --- a/chrome/installer/util/browser_distribution.cc +++ b/chrome/installer/util/browser_distribution.cc @@ -198,10 +198,6 @@ std::wstring BrowserDistribution::GetVersionKey() { return L"Software\\Chromium"; } -std::wstring BrowserDistribution::GetEnvVersionKey() { - return L"CHROMIUM_VERSION"; -} - bool BrowserDistribution::CanSetAsDefault() { return true; } diff --git a/chrome/installer/util/browser_distribution.h b/chrome/installer/util/browser_distribution.h index d60b675..53aa540 100644 --- a/chrome/installer/util/browser_distribution.h +++ b/chrome/installer/util/browser_distribution.h @@ -81,8 +81,6 @@ class BrowserDistribution { virtual std::wstring GetVersionKey(); - virtual std::wstring GetEnvVersionKey(); - virtual bool CanSetAsDefault(); virtual int GetIconIndex(); diff --git a/chrome/installer/util/chrome_frame_distribution.cc b/chrome/installer/util/chrome_frame_distribution.cc index 623715d..896cd87 100644 --- a/chrome/installer/util/chrome_frame_distribution.cc +++ b/chrome/installer/util/chrome_frame_distribution.cc @@ -95,10 +95,6 @@ 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 40ccf49..7c368119 100644 --- a/chrome/installer/util/chrome_frame_distribution.h +++ b/chrome/installer/util/chrome_frame_distribution.h @@ -44,8 +44,6 @@ 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 375a4e1..f60fb96 100644 --- a/chrome/installer/util/google_chrome_distribution.cc +++ b/chrome/installer/util/google_chrome_distribution.cc @@ -492,10 +492,6 @@ 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 d6fa281..221f6b4 100644 --- a/chrome/installer/util/google_chrome_distribution.h +++ b/chrome/installer/util/google_chrome_distribution.h @@ -63,8 +63,6 @@ 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); diff --git a/chrome/installer/util/google_chrome_distribution_dummy.cc b/chrome/installer/util/google_chrome_distribution_dummy.cc index 0cb540c..94b2ddd 100644 --- a/chrome/installer/util/google_chrome_distribution_dummy.cc +++ b/chrome/installer/util/google_chrome_distribution_dummy.cc @@ -98,11 +98,6 @@ std::wstring GoogleChromeDistribution::GetVersionKey() { return std::wstring(); } -std::wstring GoogleChromeDistribution::GetEnvVersionKey() { - NOTREACHED(); - return std::wstring(); -} - void GoogleChromeDistribution::UpdateDiffInstallStatus(bool system_install, bool incremental_install, installer_util::InstallStatus install_status) { NOTREACHED(); diff --git a/chrome/installer/util/google_chrome_sxs_distribution.cc b/chrome/installer/util/google_chrome_sxs_distribution.cc index be61503..b24c9c3 100644 --- a/chrome/installer/util/google_chrome_sxs_distribution.cc +++ b/chrome/installer/util/google_chrome_sxs_distribution.cc @@ -41,10 +41,6 @@ std::wstring GoogleChromeSxSDistribution::GetUninstallRegPath() { installer_util::kSxSSuffix); } -std::wstring GoogleChromeSxSDistribution::GetEnvVersionKey() { - return L"CHROME_SXS_VERSION"; -} - bool GoogleChromeSxSDistribution::CanSetAsDefault() { return false; } diff --git a/chrome/installer/util/google_chrome_sxs_distribution.h b/chrome/installer/util/google_chrome_sxs_distribution.h index 8a53d34..5981d46 100644 --- a/chrome/installer/util/google_chrome_sxs_distribution.h +++ b/chrome/installer/util/google_chrome_sxs_distribution.h @@ -24,7 +24,6 @@ class GoogleChromeSxSDistribution : public GoogleChromeDistribution { virtual std::wstring GetBrowserAppId(); virtual std::wstring GetInstallSubDir(); virtual std::wstring GetUninstallRegPath(); - virtual std::wstring GetEnvVersionKey(); virtual bool CanSetAsDefault(); virtual int GetIconIndex(); virtual bool GetChromeChannel(std::wstring* channel); |