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

Unified Diff: chrome/installer/util/google_update_util.cc

Issue 2618583005: Remove support for non-browser products from InstallationState and ProductState. (Closed)
Patch Set: sync to position 442664 Created 3 years, 11 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 | « chrome/installer/util/google_update_settings_unittest.cc ('k') | chrome/installer/util/helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/google_update_util.cc
diff --git a/chrome/installer/util/google_update_util.cc b/chrome/installer/util/google_update_util.cc
index 0e69b414c802661788ca645b9a3e178da7a059fc..fd3781970ee01e6993fde64f63efdcc1831f42fd 100644
--- a/chrome/installer/util/google_update_util.cc
+++ b/chrome/installer/util/google_update_util.cc
@@ -152,9 +152,8 @@ void ElevateIfNeededToReenableUpdates() {
return;
}
installer::ProductState product_state;
- BrowserDistribution* dist = BrowserDistribution::GetDistribution();
const bool system_install = !InstallUtil::IsPerUserInstall(chrome_exe);
- if (!product_state.Initialize(system_install, dist))
+ if (!product_state.Initialize(system_install))
return;
base::FilePath exe_path(product_state.GetSetupPath());
if (exe_path.empty() || !base::PathExists(exe_path)) {
@@ -164,7 +163,7 @@ void ElevateIfNeededToReenableUpdates() {
base::CommandLine cmd(exe_path);
cmd.AppendSwitch(installer::switches::kReenableAutoupdates);
- installer::Product product(dist);
+ installer::Product product(BrowserDistribution::GetDistribution());
product.InitializeFromUninstallCommand(product_state.uninstall_command());
product.AppendProductFlags(&cmd);
if (system_install)
« no previous file with comments | « chrome/installer/util/google_update_settings_unittest.cc ('k') | chrome/installer/util/helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698