Index: chrome/installer/setup/setup_main.cc |
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc |
index 7f6bf0ca5b9d828375e116c2cd802a904ccf5675..43295e9d229836558664954bdc362f483feedf4c 100644 |
--- a/chrome/installer/setup/setup_main.cc |
+++ b/chrome/installer/setup/setup_main.cc |
@@ -159,7 +159,7 @@ void AddExistingMultiInstalls(const InstallationState& original_state, |
installer_state->AddProductFromState(type, *state); |
VLOG(1) << "Product already installed and must be included: " |
<< BrowserDistribution::GetSpecificDistribution( |
- type)->GetApplicationName(); |
+ type)->GetBaseAppName(); |
grt (UTC plus 2)
2012/06/08 19:54:21
At some point I had started using the shortcut nam
gab
2012/06/11 16:04:40
Done.
|
} |
} |
} |
@@ -399,7 +399,7 @@ bool CheckMultiInstallConditions(const InstallationState& original_state, |
multi_chrome->SetOption(installer::kOptionMultiInstall, true); |
chrome = installer_state->AddProduct(&multi_chrome); |
VLOG(1) << "Upgrading existing multi-install Chrome browser along with " |
- << chrome_frame->distribution()->GetApplicationName(); |
+ << chrome_frame->distribution()->GetBaseAppName(); |
} else if (chrome_frame->HasOption(installer::kOptionReadyMode)) { |
// Chrome Frame with ready-mode is to be installed, yet Chrome is |
// neither installed nor being installed. Fail. |
@@ -480,7 +480,7 @@ bool CheckPreInstallConditions(const InstallationState& original_state, |
// Block downgrades from multi-install to single-install. |
if (!installer_state->is_multi_install() && |
product_state->is_multi_install()) { |
- LOG(ERROR) << "Multi-install " << browser_dist->GetApplicationName() |
+ LOG(ERROR) << "Multi-install " << browser_dist->GetBaseAppName() |
<< " exists; aborting single install."; |
*status = installer::MULTI_INSTALLATION_EXISTS; |
installer_state->WriteInstallerResult(*status, |