summaryrefslogtreecommitdiffstats
path: root/chrome_frame/chrome_frame_elevation.rgs
diff options
context:
space:
mode:
authorgrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-23 20:48:58 +0000
committergrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-23 20:48:58 +0000
commit848bdf233744cbac6de76f569c19614404443828 (patch)
treeb42c698778e602f4f49d91352a7de591e9cda3dc /chrome_frame/chrome_frame_elevation.rgs
parent8208335b3360a6cd209c51f3906140a9a6425b09 (diff)
downloadchromium_src-848bdf233744cbac6de76f569c19614404443828.zip
chromium_src-848bdf233744cbac6de76f569c19614404443828.tar.gz
chromium_src-848bdf233744cbac6de76f569c19614404443828.tar.bz2
Fix in-use updates for Chrome Frame.
On in-use updates, make a copy of the old chrome launcher's IE low rights elevation policy prior to registering the new npchrome_frame.dll so that running instances of IE can still launch Chrome. In so doing, I also removed elevation policy addition/removal code from the installer so that npchrome_frame.dll's {un,}registration code is the one and only place where this is done. BUG=95810 TEST=Install a previous version of GCF, run IE and visit some page that activates GCF, update to a version of GCF containing this fix, then try to visit another page that will activate GCF. If all goes well, you won't see an IE security prompt. Review URL: http://codereview.chromium.org/7976045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102569 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_elevation.rgs')
-rw-r--r--chrome_frame/chrome_frame_elevation.rgs4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/chrome_frame_elevation.rgs b/chrome_frame/chrome_frame_elevation.rgs
index ee4485d..9684583 100644
--- a/chrome_frame/chrome_frame_elevation.rgs
+++ b/chrome_frame/chrome_frame_elevation.rgs
@@ -4,14 +4,14 @@
NoRemove 'Internet Explorer' {
NoRemove 'Low Rights' {
NoRemove ElevationPolicy {
- ForceRemove '{E0A900DF-9611-4446-86BD-4B1D47E7DB2A}' = s '' {
+ ForceRemove '%CHROME_FRAME_CLSID%' = s '' {
val Policy = d '3'
val AppName = s '%CHROME_LAUNCHER_APPNAME%'
val AppPath = s '%CHROME_LAUNCHER_APPPATH%'
}
}
NoRemove DragDrop {
- ForceRemove '{E0A900DF-9611-4446-86BD-4B1D47E7DB2A}' = s '' {
+ ForceRemove '%CHROME_FRAME_CLSID%' = s '' {
val Policy = d '3'
val AppName = s '%CHROME_APPNAME%'
val AppPath = s '%CHROME_APPPATH%'