Merge 21428 - Allow two user level installs of Chrome to have default browser...

chrome/installer/setup/uninstall.h

Index: chrome/installer/setup/uninstall.h
===================================================================
--- chrome/installer/setup/uninstall.h	(revision 23187)
+++ chrome/installer/setup/uninstall.h	(working copy)
@@ -4,8 +4,8 @@
 //
 // This file declares Chrome uninstall related functions.
 
-#ifndef CHROME_INSTALLER_SETUP_UNINSTALL_H__
-#define CHROME_INSTALLER_SETUP_UNINSTALL_H__
+#ifndef CHROME_INSTALLER_SETUP_UNINSTALL_H_
+#define CHROME_INSTALLER_SETUP_UNINSTALL_H_
 
 #include <string>
 
@@ -18,8 +18,10 @@
 namespace installer_setup {
 // This function removes all Chrome registration related keys. It returns true
 // if successful, otherwise false. The error code is set in |exit_code|.
-// |root| is the registry root (HKLM|HKCU)
+// |root| is the registry root (HKLM|HKCU) and |browser_entry_suffix| is the
+// suffix for default browser entry name in the registry (optional).
 bool DeleteChromeRegistrationKeys(HKEY root,
+                                  const std::wstring& browser_entry_suffix,
                                   installer_util::InstallStatus& exit_code);
 
 // This function uninstalls Chrome.
@@ -42,4 +44,4 @@
 
 }  // namespace installer_setup
 
-#endif  // CHROME_INSTALLER_SETUP_UNINSTALL_H__
+#endif  // CHROME_INSTALLER_SETUP_UNINSTALL_H_
Property changes on: chrome\installer\setup\uninstall.h
___________________________________________________________________
Added: svn:mergeinfo
   Merged /trunk/src/chrome/installer/setup/uninstall.h:r21428
   Merged /branches/chrome_webkit_merge_branch/chrome/installer/setup/uninstall.h:r69-2775