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

chrome/installer/util/util_constants.h

Index: chrome/installer/util/util_constants.h
===================================================================
--- chrome/installer/util/util_constants.h	(revision 23187)
+++ chrome/installer/util/util_constants.h	(working copy)
@@ -5,8 +5,8 @@
 // Defines all install related constants that need to be used by Chrome as
 // well as Chrome Installer.
 
-#ifndef CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H__
-#define CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H__
+#ifndef CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H_
+#define CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H_
 
 namespace installer_util {
 
@@ -56,6 +56,7 @@
 extern const wchar_t kMakeChromeDefault[];
 extern const wchar_t kNewSetupExe[];
 extern const wchar_t kRegisterChromeBrowser[];
+extern const wchar_t kRegisterChromeBrowserSuffix[];
 extern const wchar_t kRenameChromeExe[];
 extern const wchar_t kRemoveChromeRegistration[];
 extern const wchar_t kRunAsAdmin[];
@@ -84,4 +85,4 @@
 
 }  // namespace installer_util
 
-#endif  // CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H__
+#endif  // CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H_
Property changes on: chrome\installer\util\util_constants.h
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/installer/util/util_constants.h:r21428