diff options
author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-23 00:20:44 +0000 |
---|---|---|
committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-23 00:20:44 +0000 |
commit | f7be2197bdd73fa0249a005c72112e982a6520d5 (patch) | |
tree | 9aed6a5c6839017a1bf466914c2f97b91a180801 /chrome/installer | |
parent | c9f8a4f1c96ffa319698778e53aa08d9ea39a91d (diff) | |
download | chromium_src-f7be2197bdd73fa0249a005c72112e982a6520d5.zip chromium_src-f7be2197bdd73fa0249a005c72112e982a6520d5.tar.gz chromium_src-f7be2197bdd73fa0249a005c72112e982a6520d5.tar.bz2 |
Win: Use different icon for SxS
BUG=37119
TEST=build official exe, run with --chrome-sxs
Review URL: http://codereview.chromium.org/1727006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45388 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
4 files changed, 11 insertions, 0 deletions
diff --git a/chrome/installer/util/browser_distribution.cc b/chrome/installer/util/browser_distribution.cc index afce15f..210e8e1 100644 --- a/chrome/installer/util/browser_distribution.cc +++ b/chrome/installer/util/browser_distribution.cc @@ -138,6 +138,10 @@ bool BrowserDistribution::CanSetAsDefault() { return true; } +bool BrowserDistribution::ShouldUseAlternateIcon() { + return false; +} + void BrowserDistribution::UpdateDiffInstallStatus(bool system_install, bool incremental_install, installer_util::InstallStatus install_status) { } diff --git a/chrome/installer/util/browser_distribution.h b/chrome/installer/util/browser_distribution.h index b788310..66ba1e2 100644 --- a/chrome/installer/util/browser_distribution.h +++ b/chrome/installer/util/browser_distribution.h @@ -60,6 +60,8 @@ class BrowserDistribution { virtual bool CanSetAsDefault(); + virtual bool ShouldUseAlternateIcon(); + virtual void UpdateDiffInstallStatus(bool system_install, bool incremental_install, installer_util::InstallStatus install_status); diff --git a/chrome/installer/util/google_chrome_sxs_distribution.cc b/chrome/installer/util/google_chrome_sxs_distribution.cc index 8a806bc..858e35f 100644 --- a/chrome/installer/util/google_chrome_sxs_distribution.cc +++ b/chrome/installer/util/google_chrome_sxs_distribution.cc @@ -37,3 +37,7 @@ std::wstring GoogleChromeSxSDistribution::GetUninstallRegPath() { bool GoogleChromeSxSDistribution::CanSetAsDefault() { return false; } + +bool GoogleChromeSxSDistribution::ShouldUseAlternateIcon() { + return true; +} diff --git a/chrome/installer/util/google_chrome_sxs_distribution.h b/chrome/installer/util/google_chrome_sxs_distribution.h index 452a3df..9fc540d 100644 --- a/chrome/installer/util/google_chrome_sxs_distribution.h +++ b/chrome/installer/util/google_chrome_sxs_distribution.h @@ -23,6 +23,7 @@ class GoogleChromeSxSDistribution : public GoogleChromeDistribution { virtual std::wstring GetInstallSubDir(); virtual std::wstring GetUninstallRegPath(); virtual bool CanSetAsDefault(); + virtual bool ShouldUseAlternateIcon(); private: friend class BrowserDistribution; |