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

chrome/installer/util/util_constants.cc

Index: chrome/installer/util/util_constants.cc
===================================================================
--- chrome/installer/util/util_constants.cc	(revision 23187)
+++ chrome/installer/util/util_constants.cc	(working copy)
@@ -57,6 +57,9 @@
 // options kInstallArchive and kUninstall are ignored.
 const wchar_t kRegisterChromeBrowser[] = L"register-chrome-browser";
 
+const wchar_t kRegisterChromeBrowserSuffix[] =
+    L"register-chrome-browser-suffix";
+
 // Renames chrome.exe to old_chrome.exe and renames new_chrome.exe to chrome.exe
 // to support in-use updates. Also deletes opv key.
 const wchar_t kRenameChromeExe[] = L"rename-chrome-exe";
Property changes on: chrome\installer\util\util_constants.cc
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/chrome/installer/util/util_constants.cc:r69-2775
   Merged /trunk/src/chrome/installer/util/util_constants.cc:r21428