Use different product IO for SxS in mini installer.

BUG=44846
TEST=mini_installer --chrome-sxs


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

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

4 files changed, 14 insertions, 1 deletions

diff --git a/chrome/installer/mini_installer/appid.h b/chrome/installer/mini_installer/appid.h
index 552c5e6..db6fa93 100644
--- a/chrome/installer/mini_installer/appid.h
+++ b/chrome/installer/mini_installer/appid.h
@@ -8,6 +8,7 @@
 // The appid included by the mini_installer.
 namespace google_update {
 extern const wchar_t kAppGuid[];
+extern const wchar_t kSxSAppGuid[];
 }
 
 #endif  // CHROME_INSTALLER_MINI_INSTALLER_APPID_H_
diff --git a/chrome/installer/mini_installer/chrome_appid.cc b/chrome/installer/mini_installer/chrome_appid.cc
index 799aad1..4f5fb5f 100644
--- a/chrome/installer/mini_installer/chrome_appid.cc
+++ b/chrome/installer/mini_installer/chrome_appid.cc
@@ -6,4 +6,5 @@
 
 namespace google_update {
 const wchar_t kAppGuid[] = L"{8A69D345-D564-463c-AFF1-A69D9E530F96}";
+const wchar_t kSxSAppGuid[] = L"{4ea16ac7-fd5a-47c3-875b-dbf4a2008c20}";
 }
diff --git a/chrome/installer/mini_installer/chrome_frame_appid.cc b/chrome/installer/mini_installer/chrome_frame_appid.cc
index 1462292..51a74ee 100644
--- a/chrome/installer/mini_installer/chrome_frame_appid.cc
+++ b/chrome/installer/mini_installer/chrome_frame_appid.cc
@@ -6,4 +6,5 @@
 
 namespace google_update {
 const wchar_t kAppGuid[] = L"{8BA986DA-5100-405E-AA35-86F34A02ACBF}";
+const wchar_t kSxSAppGuid[] = L"";
 }
diff --git a/chrome/installer/mini_installer/mini_installer.cc b/chrome/installer/mini_installer/mini_installer.cc
index 3bee0d6..5a969d0 100644
--- a/chrome/installer/mini_installer/mini_installer.cc
+++ b/chrome/installer/mini_installer/mini_installer.cc
@@ -150,10 +150,20 @@ bool ReadValueFromRegistry(HKEY root_key, const wchar_t *sub_key,
 void SetFullInstallerFlag(HKEY root_key) {
   HKEY key;
   wchar_t ap_registry_key[128];
+  const wchar_t* app_guid = google_update::kAppGuid;
+
+  int args_num;
+  wchar_t* cmd_line = ::GetCommandLine();
+  wchar_t** args = ::CommandLineToArgvW(cmd_line, &args_num);
+  for (int i = 1; i < args_num; ++i) {
+    if (0 == ::lstrcmpi(args[i], L"--chrome-sxs"))
+      app_guid = google_update::kSxSAppGuid;
+  }
+
   if (!SafeStrCopy(ap_registry_key, _countof(ap_registry_key),
                    kApRegistryKeyBase) ||
       !SafeStrCat(ap_registry_key, _countof(ap_registry_key),
-                  google_update::kAppGuid)) {
+                  app_guid)) {
     return;
   }
   if (::RegOpenKeyEx(root_key, ap_registry_key, NULL,