summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoramit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-11 21:03:30 +0000
committeramit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-11 21:03:30 +0000
commit0f5945b1f0097598ea16bdbc72075945d9f90e9e (patch)
treea5563a09e78b14e1b294fea1dcc8691b228e3b7b
parentfaa43b74c1f27b8f81c0e5d672ae9b62088ce29a (diff)
downloadchromium_src-0f5945b1f0097598ea16bdbc72075945d9f90e9e.zip
chromium_src-0f5945b1f0097598ea16bdbc72075945d9f90e9e.tar.gz
chromium_src-0f5945b1f0097598ea16bdbc72075945d9f90e9e.tar.bz2
Bring back RefreshElevationPolicy to avoid prompts on Vista and Win7
TEST=upgrade from older version, it should not prompt to load page in chrome frame on Vista and Windows 7. BUG=51747 Review URL: http://codereview.chromium.org/3153006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55782 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome_frame/chrome_tab.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc
index 4f264a5..ec6954b 100644
--- a/chrome_frame/chrome_tab.cc
+++ b/chrome_frame/chrome_tab.cc
@@ -344,6 +344,9 @@ STDAPI CustomRegistration(UINT reg_flags, BOOL reg) {
// _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.
+ RefreshElevationPolicy();
}
if ((hr == S_OK) && (flags & GCF_PROTOCOL)) {