Fix in-use updates for Chrome Frame.

chrome_frame/chrome_tab.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // chrome_tab.cc : Implementation of DLL Exports.
 
 // Include without path to make GYP build see it.
 #include "chrome_tab.h"  // NOLINT
 
 #include <atlsecurity.h>
+#include <objbase.h>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
 #include "base/logging.h"
 #include "base/logging_win.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/string_piece.h"
@@ skipping 145 matching lines @@
       // static T::UpdateRegistry() methods directly, which doesn't allow
       // pMapEntries to be passed through :-(
       if (do_system_registration_) {
         hr = registrar->AddReplacement(L"HIVE", L"HKLM");
       } else {
         hr = registrar->AddReplacement(L"HIVE", L"HKCU");
       }
       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;
   }
 
   // See comments in AddCommonRGSReplacements
   bool do_system_registration_;
 };
 
 ChromeTabModule _AtlModule;
 
 base::AtExitManager* g_exit_manager = NULL;
@@ skipping 406 matching lines @@
 
 HRESULT RegisterActiveX(bool reg, bool is_system) {
   // We have to call the static T::UpdateRegistry function instead of
   // _AtlModule.UpdateRegistryFromResourceS(IDR_CHROMEFRAME_ACTIVEX, reg)
   // because there is specific OLEMISC replacement.
   return ChromeFrameActivex::UpdateRegistry(reg);
 }
 
 HRESULT RegisterElevationPolicy(bool reg, bool is_system) {
   HRESULT hr = S_OK;
-  if (reg && base::win::GetVersion() >= base::win::VERSION_VISTA) {
+  if (base::win::GetVersion() >= base::win::VERSION_VISTA) {
     // Register the elevation policy. This must succeed for Chrome Frame to
     // be able launch Chrome when running in low-integrity IE.
-    // Note that this is not done on unregistration, the installer will
-    // explicitly remove the policy on uninstall.
-    hr = _AtlModule.UpdateRegistryFromResourceS(IDR_CHROMEFRAME_ELEVATION,
-                                                reg);
+    hr = _AtlModule.UpdateRegistryFromResourceS(IDR_CHROMEFRAME_ELEVATION, reg);
     if (SUCCEEDED(hr)) {
       hr = RefreshElevationPolicy();
     }
   }
   return hr;
 }
 
 HRESULT RegisterProtocol(bool reg, bool is_system) {
   return _AtlModule.UpdateRegistryFromResourceS(IDR_CHROMEPROTOCOL, reg);
 }
@@ skipping 292 matching lines @@
   HRESULT hr = CustomRegistration(ALL, FALSE, false);
   return hr;
 }
 
 // Object entries go here instead of with each object, so that we can move
 // the objects to a lib. Also reduces magic.
 OBJECT_ENTRY_AUTO(CLSID_ChromeFrameBHO, Bho)
 OBJECT_ENTRY_AUTO(__uuidof(ChromeActiveDocument), ChromeActiveDocument)
 OBJECT_ENTRY_AUTO(__uuidof(ChromeFrame), ChromeFrameActivex)
 OBJECT_ENTRY_AUTO(__uuidof(ChromeProtocol), ChromeProtocol)