chrome/installer/setup/setup_main.cc - Issue 10451074: Always suffix ChromeHTML entries on Windows for user-level installs.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10451074: Always suffix ChromeHTML entries on Windows for user-level installs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: address comments + introduce ShellUtil::QuickIsChromeRegistered() Created 8 years, 6 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:

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..7f6bf0ca5b9d828375e116c2cd802a904ccf5675 100644

--- a/chrome/installer/setup/setup_main.cc

+++ b/chrome/installer/setup/setup_main.cc

@@ -724,8 +724,10 @@ installer::InstallStatus InstallProductsHelper(

(install_status == installer::IN_USE_UPDATED)) {

const Product* chrome = installer_state.FindProduct(

BrowserDistribution::CHROME_BROWSER);

- if (chrome != NULL)

- installer::RemoveChromeLegacyRegistryKeys(chrome->distribution());

+ if (chrome != NULL) {

+ installer::RemoveChromeLegacyRegistryKeys(chrome->distribution(),

+ chrome_exe);

+ }

}