chrome/installer/util/shell_util.cc - Issue 10823437: Callback flow to register Chrome and update shortcuts after OS upgrade to Windows 8

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/util/shell_util.cc

Issue 10823437: Callback flow to register Chrome and update shortcuts after OS upgrade to Windows 8 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Refactoring; renamed OnOsUpgrade() to HandleOsUpgradeForBrowser(). Created 8 years, 4 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

« chrome/installer/setup/setup_main.cc ('K') | « chrome/installer/util/installation_validator_unittest.cc ('k') | chrome/installer/util/util_constants.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/installer/util/shell_util.cc

diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc

index 37ed8c214ea4ccb25235cdf4606505f92aea8a4e..f10e5898b4d5796b17cb6079245f71e0bd7b45a7 100644

--- a/chrome/installer/util/shell_util.cc

+++ b/chrome/installer/util/shell_util.cc

@@ -1457,10 +1457,8 @@ bool ShellUtil::RegisterChromeBrowser(BrowserDistribution* dist,

&progid_and_appreg_entries);

RegistryEntry::GetShellIntegrationEntries(

dist, chrome_exe, suffix, &shell_entries);

- return AddRegistryEntries(user_level ? HKEY_CURRENT_USER :

- HKEY_LOCAL_MACHINE,

- progid_and_appreg_entries) &&

- AddRegistryEntries(root, shell_entries);

+ return AddRegistryEntries(root, progid_and_appreg_entries) &&

gab 2012/08/30 17:55:19 Do not check this in!!

grt (UTC plus 2) 2012/08/30 19:10:18 Good catch! +1 to that.

huangs 2012/08/30 20:14:22 Doh! Forgot about this.

+ AddRegistryEntries(root, shell_entries);

}

// If the user is not an admin and OS is between Vista and Windows 7

« chrome/installer/setup/setup_main.cc ('K') | « chrome/installer/util/installation_validator_unittest.cc ('k') | chrome/installer/util/util_constants.h » ('j') | no next file with comments »