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

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

Issue 12454002: Removing code to delete obsolete "Google Chrome App Host" uninstall entries in the registry. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 10 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/setup_main.cc
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc
index 12fd98d907ef58013a7723727b809ffd55c2436a..073d4423e19526182a45c3c3ef53e3e210b09069 100644
--- a/chrome/installer/setup/setup_main.cc
+++ b/chrome/installer/setup/setup_main.cc
@@ -1580,24 +1580,6 @@ google_breakpad::ExceptionHandler* InitializeCrashReporting(
return breakpad;
}
-// We renamed "Google Chrome App Host" to "Google Chrome App Launcher",
-// and need to do the same in the Windows\CurrentVersion\Uninstall registry key.
-// The addition / removal of the new key is handled elsewhere.
-// It remains to remove the old key where appropriate.
-// TODO(huangs): Remove this in early March.
-void RemoveDeprecatedAppHostUninstallEntry(
- const InstallerState& installer_state) {
- const Product* app_host =
- installer_state.FindProduct(BrowserDistribution::CHROME_APP_HOST);
- if (app_host) {
- const string16 kDeprecatedUninstallRegPath(L"Software\\Microsoft\\Windows\\"
- L"CurrentVersion\\Uninstall\\Google Chrome App Host");
- InstallUtil::DeleteRegistryKey(installer_state.root_key(),
- kDeprecatedUninstallRegPath);
- }
-}
-
-
} // namespace
int WINAPI wWinMain(HINSTANCE instance, HINSTANCE prev_instance,
@@ -1701,11 +1683,6 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE prev_instance,
InstallProducts(original_state, cmd_line, prefs, &installer_state);
}
- // TODO(huangs): Remove this in early March.
- if (!InstallUtil::GetInstallReturnCode(install_status))
- RemoveDeprecatedAppHostUninstallEntry(installer_state);
-
-
// Validate that the machine is now in a good state following the operation.
// TODO(grt): change this to log at DFATAL once we're convinced that the
// validator handles all cases properly.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698