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

Unified Diff: chrome/installer/setup/install.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/browser/chrome_browser_main_win.cc ('k') | chrome/installer/setup/install_worker_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/install.cc
diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc
index 34976475d08aec97143997ad7f34424bcdecc6ab..2ef556d97525c3f70a2045c7150b0adebc565ca9 100644
--- a/chrome/installer/setup/install.cc
+++ b/chrome/installer/setup/install.cc
@@ -508,7 +508,6 @@ InstallStatus InstallOrUpdateProduct(
// Creates shortcuts for Chrome.
const Product& chrome_product = installer_state.product();
- BrowserDistribution* chrome_dist = chrome_product.distribution();
const base::FilePath chrome_exe(
installer_state.target_path().Append(kChromeExe));
@@ -523,8 +522,7 @@ InstallStatus InstallOrUpdateProduct(
INSTALL_SHORTCUT_REPLACE_EXISTING;
if (result == installer::FIRST_INSTALL_SUCCESS ||
result == installer::INSTALL_REPAIRED ||
- !original_state.GetProductState(installer_state.system_install(),
- chrome_dist->GetType())) {
+ !original_state.GetProductState(installer_state.system_install())) {
// Always create the shortcuts on a new install, a repair install, and
// when the Chrome product is being added to the current install.
install_operation = INSTALL_SHORTCUT_CREATE_ALL;
« no previous file with comments | « chrome/browser/chrome_browser_main_win.cc ('k') | chrome/installer/setup/install_worker_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698