chrome/installer/setup/uninstall.cc - Issue 1473813003: Add a GetRegistryPath method to BrowserDistribution.

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/uninstall.cc

Issue 1473813003: Add a GetRegistryPath method to BrowserDistribution. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: improve method comment. Created 5 years, 1 month 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/safe_browsing/incident_reporting/platform_state_store_win.cc ('k') | chrome/installer/util/browser_distribution.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/installer/setup/uninstall.cc

diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc

index e81dffd26ce5b7add41c58ce313d109d23d8156a..9d8fdf8e2d938e90f4bfb3808f4acea0ec2a20bb 100644

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

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

@@ -858,12 +858,10 @@ void RemoveDistributionRegistryState(BrowserDistribution* distribution) {

L"Extensions",

L"NativeMessagingHosts",

};

- base::string16 key_name(L"Software\\");

- key_name += distribution->GetInstallSubDir();

// Delete the contents of the distribution key except for those parts used by

// outsiders to configure Chrome.

DeleteRegistryKeyPartial(

- HKEY_CURRENT_USER, key_name,

+ HKEY_CURRENT_USER, distribution->GetRegistryPath(),

std::vector<base::string16>(

&kKeysToPreserve[0],

&kKeysToPreserve[arraysize(kKeysToPreserve) - 1]));