Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5039)

Unified Diff: chrome/installer/setup/setup_main.cc

Issue 10446111: Abstract suffixing logic away from GetApplicationName (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/installer/setup/setup_main.cc
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc
index ad881c2fcc8b4eb62451416f7c43be0123776f92..d4f3770403eb06c924dbc5bb3da0a0b05f5f8d7d 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)->GetUnsuffixedAppName();
}
}
}
@@ -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()->GetUnsuffixedAppName();
} 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->GetUnsuffixedAppName()
<< " exists; aborting single install.";
*status = installer::MULTI_INSTALLATION_EXISTS;
installer_state->WriteInstallerResult(*status,

Powered by Google App Engine
This is Rietveld 408576698