Change the system-level EULA dialog to not use GET parameters with res:// urls. Instead use the dialogArgument property on the window object. res:// urls with GET parameters don't appear to work with the IE6 version of MSHTML.

BUG=88192
TEST=Install system-level Chrome on a new machine with a master_preferences file that includes "require_eula":true. Observe that a non-blank EULA dialog shows up and that the user can run Chrome.
Review URL: http://codereview.chromium.org/7309008

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

1 files changed, 25 insertions, 25 deletions

diff --git a/chrome/installer/setup/eula/oem.js b/chrome/installer/setup/eula/oem.js
index 5831b34..e142911 100644
--- a/chrome/installer/setup/eula/oem.js
+++ b/chrome/installer/setup/eula/oem.js
@@ -1,26 +1,26 @@
-function setInnerFrame() {

-  var regex = new RegExp("\\?innerframe=\"?([^&#\"]*)\"?");

-  var results = regex.exec(window.location.href);

-  if(results && results[1])

-    document.getElementById('ifr').src = results[1];

-}

-

-function checkAccept(f) {

-  if (f.accept.checked) {

-    window.returnValue = 6;

-  } else {

-    window.returnValue = 1;

-  }

-  window.close();

-}

-

-function resize() {

-  var ifr = document.getElementById('ifr');

-  var footer = document.getElementById('footer');

-  

-  ifr.height = footer.offsetTop - ifr.offsetTop;

-  setInnerFrame();

-}

-

-window.onresize = resize;

+function setInnerFrame() {
+  var inner_frame = window.dialogArguments;
+  if (inner_frame) {
+    document.getElementById('ifr').src = inner_frame;
+  }
+}
+
+function checkAccept(f) {
+  if (f.accept.checked) {
+    window.returnValue = 6;
+  } else {
+    window.returnValue = 1;
+  }
+  window.close();
+}
+
+function resize() {
+  var ifr = document.getElementById('ifr');
+  var footer = document.getElementById('footer');
+  
+  ifr.height = footer.offsetTop - ifr.offsetTop;
+  setInnerFrame();
+}
+
+window.onresize = resize;
 window.onload = resize;
\ No newline at end of file