Remove Chrome's ProgID from filetype associations at uninstall.

chrome/installer/setup/uninstall.cc

Index: chrome/installer/setup/uninstall.cc
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
index 209ff786d9f40c42ba3b8f0660fed666e077e168..0256590c65089166730ebc4df3528c0ad9af7b53 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -617,9 +617,10 @@ bool ShouldDeleteProfile(const InstallerState& installer_state,
   return should_delete;
 }
 
-bool DeleteChromeRegistrationKeys(BrowserDistribution* dist, HKEY root,
+bool DeleteChromeRegistrationKeys(const InstallerState& installer_state,
+                                  BrowserDistribution* dist,
+                                  HKEY root,
                                   const string16& browser_entry_suffix,
-                                  const FilePath& target_path,
                                   InstallStatus* exit_code) {
   DCHECK(exit_code);
   if (!dist->CanSetAsDefault()) {
@@ -627,7 +628,7 @@ bool DeleteChromeRegistrationKeys(BrowserDistribution* dist, HKEY root,
     return true;
   }
 
-  FilePath chrome_exe(target_path.Append(kChromeExe));
+  FilePath chrome_exe(installer_state.target_path().Append(kChromeExe));
 
   // Delete Software\Classes\ChromeHTML.
   // For user-level installs we now only write these entries in HKCU, but since
@@ -735,6 +736,7 @@ bool DeleteChromeRegistrationKeys(BrowserDistribution* dist, HKEY root,
   // Delete each protocol association if it references this Chrome.
   InstallUtil::ProgramCompare open_command_pred(chrome_exe);
   string16 parent_key(ShellUtil::kRegClasses);
+  parent_key.push_back(FilePath::kSeparators[0]);
   const string16::size_type base_length = parent_key.size();
   string16 child_key;
   for (const wchar_t* const* proto =
@@ -742,13 +744,30 @@ bool DeleteChromeRegistrationKeys(BrowserDistribution* dist, HKEY root,
        *proto != NULL;
        ++proto) {
     parent_key.resize(base_length);
-    parent_key.push_back(FilePath::kSeparators[0]);
     parent_key.append(*proto);
     child_key.assign(parent_key).append(ShellUtil::kRegShellOpen);
     InstallUtil::DeleteRegistryKeyIf(root, parent_key, child_key, L"",
                                      open_command_pred);
   }
 
+  // Delete each filetype association if it references this Chrome.  Take care
+  // not to delete the association if it references a system-level install of
+  // Chrome (only a risk if the suffix is empty).  Don't delete the whole key
+  // since other apps may have stored data there.
+  if (!browser_entry_suffix.empty() ||
+      (!installer_state.system_install() &&
+       !base::win::RegKey(HKEY_LOCAL_MACHINE, reg_prog_id.c_str(),
+                          KEY_QUERY_VALUE).Valid())) {
+    InstallUtil::ValueEquals prog_id_pred(prog_id);
+    for (const wchar_t* const* filetype = &ShellUtil::kFileAssociations[0];
+         *filetype != NULL; ++filetype) {
+      parent_key.resize(base_length);
+      parent_key.append(*filetype);
+      InstallUtil::DeleteRegistryValueIf(root, parent_key.c_str(), L"",
+                                         prog_id_pred);
+    }
+  }
+
   // Note that we do not attempt to delete filetype associations since MSDN
   // says "Windows respects the Default value only if the ProgID found there is
   // a registered ProgID. If the ProgID is unregistered, it is ignored."
@@ -1038,8 +1057,8 @@ InstallStatus UninstallProduct(const InstallationState& original_state,
     // Remove all Chrome registration keys.
     // Registration data is put in HKCU for both system level and user level
     // installs.
-    DeleteChromeRegistrationKeys(browser_dist, HKEY_CURRENT_USER, suffix,
-                                 installer_state.target_path(), &ret);
+    DeleteChromeRegistrationKeys(installer_state, browser_dist,
+                                 HKEY_CURRENT_USER, suffix, &ret);
 
     // If the user's Chrome is registered with a suffix: it is possible that old
     // unsuffixed registrations were left in HKCU (e.g. if this install was
@@ -1049,8 +1068,8 @@ InstallStatus UninstallProduct(const InstallationState& original_state,
     // default through the UI)).
     // Remove remaining HKCU entries with no suffix if any.
     if (!suffix.empty()) {
-      DeleteChromeRegistrationKeys(browser_dist, HKEY_CURRENT_USER, string16(),
-                                   installer_state.target_path(), &ret);
+      DeleteChromeRegistrationKeys(installer_state, browser_dist,
+                                   HKEY_CURRENT_USER, string16(), &ret);
 
       // For similar reasons it is possible in very few installs (from
       // 21.0.1180.0 and fixed shortly after) to be installed with the new-style
@@ -1058,9 +1077,8 @@ InstallStatus UninstallProduct(const InstallationState& original_state,
       string16 old_style_suffix;
       if (ShellUtil::GetOldUserSpecificRegistrySuffix(&old_style_suffix) &&
           suffix != old_style_suffix) {
-        DeleteChromeRegistrationKeys(browser_dist, HKEY_CURRENT_USER,
-                                     old_style_suffix,
-                                     installer_state.target_path(), &ret);
+        DeleteChromeRegistrationKeys(installer_state, browser_dist,
+                                     HKEY_CURRENT_USER, old_style_suffix, &ret);
       }
     }
 
@@ -1083,8 +1101,8 @@ InstallStatus UninstallProduct(const InstallationState& original_state,
         (remove_all &&
          ShellUtil::QuickIsChromeRegisteredInHKLM(
              browser_dist, chrome_exe, suffix))) {
-      DeleteChromeRegistrationKeys(browser_dist, HKEY_LOCAL_MACHINE, suffix,
-                                   installer_state.target_path(), &ret);
+      DeleteChromeRegistrationKeys(installer_state, browser_dist,
+                                   HKEY_LOCAL_MACHINE, suffix, &ret);
     }
 
     ProcessDelegateExecuteWorkItems(installer_state, product);
@@ -1096,6 +1114,10 @@ InstallStatus UninstallProduct(const InstallationState& original_state,
 #if 0
     UninstallActiveSetupEntries(installer_state, product);
 #endif
+
+    // Notify the shell that associations have changed since Chrome was likely
+    // unregistered.
+    SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, NULL, NULL);
   }
 
   if (product.is_chrome_frame()) {