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

Unified Diff: chrome/browser/chrome_browser_main_win.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 | « no previous file | chrome/installer/setup/install.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_browser_main_win.cc
diff --git a/chrome/browser/chrome_browser_main_win.cc b/chrome/browser/chrome_browser_main_win.cc
index 45cb0af5b2949d6dc78d0f515be9063701558f14..1c782dad8e77e91b9ff7e0b79a8c90e1414fc22e 100644
--- a/chrome/browser/chrome_browser_main_win.cc
+++ b/chrome/browser/chrome_browser_main_win.cc
@@ -460,8 +460,6 @@ int ChromeBrowserMainPartsWin::HandleIconsCommands(
// static
bool ChromeBrowserMainPartsWin::CheckMachineLevelInstall() {
- // TODO(tommi): Check if using the default distribution is always the right
- // thing to do.
BrowserDistribution* dist = BrowserDistribution::GetDistribution();
base::Version version;
InstallUtil::GetChromeVersion(dist, true, &version);
@@ -472,7 +470,7 @@ bool ChromeBrowserMainPartsWin::CheckMachineLevelInstall() {
base::FilePath user_exe_path(installer::GetChromeInstallPath(false, dist));
if (base::FilePath::CompareEqualIgnoreCase(exe, user_exe_path.value())) {
base::CommandLine uninstall_cmd(
- InstallUtil::GetChromeUninstallCmd(false, dist->GetType()));
+ InstallUtil::GetChromeUninstallCmd(false));
if (!uninstall_cmd.GetProgram().empty()) {
uninstall_cmd.AppendSwitch(installer::switches::kSelfDestruct);
uninstall_cmd.AppendSwitch(installer::switches::kForceUninstall);
« no previous file with comments | « no previous file | chrome/installer/setup/install.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698