Move elevation registration into a separate rgs script and leave removal of it up to the installer.

TEST=Manual registration of npchrome_frame continues to register the elevation policy, but unregistration of the DLL will not remove the elevation policy (since the installer now does that).
BUG=none

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

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

1 files changed, 9 insertions, 3 deletions

diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc
index 183204a..91f3680 100644
--- a/chrome_frame/chrome_tab.cc
+++ b/chrome_frame/chrome_tab.cc
@@ -489,7 +489,7 @@ STDAPI CustomRegistration(UINT reg_flags, BOOL reg, bool is_system) {
   UINT flags = reg_flags;
 
   if (reg && (flags & (ACTIVEDOC | ACTIVEX)))
-    flags |= (TYPELIB |GCF_PROTOCOL);
+    flags |= (TYPELIB | GCF_PROTOCOL);
 
   HRESULT hr = S_OK;
 
@@ -511,8 +511,14 @@ STDAPI CustomRegistration(UINT reg_flags, BOOL reg, bool is_system) {
     // _AtlModule.UpdateRegistryFromResourceS(IDR_CHROMEFRAME_ACTIVEX, reg)
     // because there is specific OLEMISC replacement.
     hr = ChromeFrameActivex::UpdateRegistry(reg);
-    // TODO(amit): Move elevation policy registration from ActiveX rgs
-    // into a separate rgs.
+  }
+
+  // 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) {
+    _AtlModule.UpdateRegistryFromResourceS(IDR_CHROMEFRAME_ELEVATION, reg);
     RefreshElevationPolicy();
   }