Fix bugs related to making Chrome default browser on Vista and also do some cleanup.

- Stupid bug where we were failing if there was a space or '-' in the path to setup.exe
- Some application still read default browser from Software\Classes\http even on Vista so set that
- Some refactoring of apppaths changes to make a method private that doesn't need to be public.
- Move constants in shell_util where rest of the shell related constants are.
- Remove duplicate attempts to create ChromeHTML key

BUG=7568,6732,6504

Review URL: http://codereview.chromium.org/21259

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9667 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 1 deletions

diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
index 6e2c40d..cdc2f78 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -257,7 +257,9 @@ installer_util::InstallStatus installer_setup::UninstallChrome(
                         dist->GetApplicationName());
 
     // Delete the App Paths key that lets explorer find Chrome.
-    DeleteRegistryKey(hklm_key, installer_util::kAppPathsRegistryKey);
+    std::wstring app_path_key(ShellUtil::kAppPathsRegistryKey);
+    file_util::AppendToPath(&app_path_key, installer_util::kChromeExe);
+    DeleteRegistryKey(hklm_key, app_path_key);
 
     // Delete media player registry key that exists only in HKLM.
     std::wstring reg_path(installer::kMediaPlayerRegPath);