Merge 102569 - Fix in-use updates for Chrome Frame.

chrome_frame/chrome_tab.cc

Index: chrome_frame/chrome_tab.cc
===================================================================
--- chrome_frame/chrome_tab.cc	(revision 104338)
+++ chrome_frame/chrome_tab.cc	(working copy)
@@ -8,6 +8,7 @@
 #include "chrome_tab.h"  // NOLINT
 
 #include <atlsecurity.h>
+#include <objbase.h>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
@@ -181,6 +182,13 @@
       DCHECK(SUCCEEDED(hr));
     }
 
+    if (SUCCEEDED(hr)) {
+      // Add the Chrome Frame CLSID.
+      wchar_t cf_clsid[64];
+      StringFromGUID2(CLSID_ChromeFrame, &cf_clsid[0], arraysize(cf_clsid));
+      hr = registrar->AddReplacement(L"CHROME_FRAME_CLSID", &cf_clsid[0]);
+    }
+
     return hr;
   }
 
@@ -518,11 +526,9 @@
     hr = ChromeFrameActivex::UpdateRegistry(reg);
   }
 
-  // Register the elevation policy.  We do this only for developer convenience
-  // as the installer is really responsible for doing this.
-  // Because of that, we do not unregister this policy and just leave that up
-  // to the installer.
-  if (hr == S_OK && (flags & (ACTIVEDOC | ACTIVEX)) && reg) {
+  // Register the elevation policy.  This must succeed for Chrome Frame to
+  // be able launch Chrome when running in low-integrity IE.
+  if (hr == S_OK && (flags & (ACTIVEDOC | ACTIVEX))) {
     _AtlModule.UpdateRegistryFromResourceS(IDR_CHROMEFRAME_ELEVATION, reg);
     RefreshElevationPolicy();
   }