diff options
author | gwilson@google.com <gwilson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-29 00:08:37 +0000 |
---|---|---|
committer | gwilson@google.com <gwilson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-29 00:08:37 +0000 |
commit | e68d5358f23687c4a668ea6d2f9577e28d84a53f (patch) | |
tree | 2f19c6f3118e67200cb90f231ad01aff2a7b4e1d /chrome | |
parent | 90c2c10f9d47a9ede7e17e067f5e0fe0030dbf57 (diff) | |
download | chromium_src-e68d5358f23687c4a668ea6d2f9577e28d84a53f.zip chromium_src-e68d5358f23687c4a668ea6d2f9577e28d84a53f.tar.gz chromium_src-e68d5358f23687c4a668ea6d2f9577e28d84a53f.tar.bz2 |
Changes the in-application EULA dialog to not require the checkbox be checked to accept the EULA.
Review URL: http://codereview.chromium.org/19436
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8839 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
44 files changed, 44 insertions, 44 deletions
diff --git a/chrome/installer/setup/eula/oem.js b/chrome/installer/setup/eula/oem.js index 2b0bcbd..febed6b 100644 --- a/chrome/installer/setup/eula/oem.js +++ b/chrome/installer/setup/eula/oem.js @@ -2,7 +2,7 @@ function checkAccept(f) { if (f.accept.checked) {
window.returnValue = 1;
} else {
- window.returnValue = 2;
+ window.returnValue = 6;
}
window.close();
}
diff --git a/chrome/installer/setup/eula/oem_ar.html b/chrome/installer/setup/eula/oem_ar.html index f76b0a6..b358cd9 100755 --- a/chrome/installer/setup/eula/oem_ar.html +++ b/chrome/installer/setup/eula/oem_ar.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="قبول وتشغيل" /> <input type="submit" name="cancel" value="إلغاء" />
+ <input type="submit" name="submit" value="قبول وتشغيل" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="إلغاء" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_bg.html b/chrome/installer/setup/eula/oem_bg.html index 8c3bdad..945f700 100755 --- a/chrome/installer/setup/eula/oem_bg.html +++ b/chrome/installer/setup/eula/oem_bg.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="Приемам и инсталирам" /> <input type="submit" name="cancel" value="Отказ" />
+ <input type="submit" name="submit" value="Приемам и инсталирам" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="Отказ" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_ca.html b/chrome/installer/setup/eula/oem_ca.html index a817a7e..0c44cb7 100755 --- a/chrome/installer/setup/eula/oem_ca.html +++ b/chrome/installer/setup/eula/oem_ca.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="Accepta i executa'l" /> <input type="submit" name="cancel" value="Cancel·la" />
+ <input type="submit" name="submit" value="Accepta i executa'l" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="Cancel·la" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_cs.html b/chrome/installer/setup/eula/oem_cs.html index 838a7dd..49bdbbb 100755 --- a/chrome/installer/setup/eula/oem_cs.html +++ b/chrome/installer/setup/eula/oem_cs.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="Přijmout a spustit" /> <input type="submit" name="cancel" value="Zrušit" />
+ <input type="submit" name="submit" value="Přijmout a spustit" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="Zrušit" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_da.html b/chrome/installer/setup/eula/oem_da.html index c635617..c95456d 100755 --- a/chrome/installer/setup/eula/oem_da.html +++ b/chrome/installer/setup/eula/oem_da.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="Accepter og kør" /> <input type="submit" name="cancel" value="Annuller" />
+ <input type="submit" name="submit" value="Accepter og kør" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="Annuller" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_de.html b/chrome/installer/setup/eula/oem_de.html index a289034..89bf498 100755 --- a/chrome/installer/setup/eula/oem_de.html +++ b/chrome/installer/setup/eula/oem_de.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="Akzeptieren und Ausführen" /> <input type="submit" name="cancel" value="Abbrechen" />
+ <input type="submit" name="submit" value="Akzeptieren und Ausführen" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="Abbrechen" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_el.html b/chrome/installer/setup/eula/oem_el.html index 7a16da2..a55d47e 100755 --- a/chrome/installer/setup/eula/oem_el.html +++ b/chrome/installer/setup/eula/oem_el.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="Αποδοχή και εκτέλεση" /> <input type="submit" name="cancel" value="Ακύρωση" />
+ <input type="submit" name="submit" value="Αποδοχή και εκτέλεση" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="Ακύρωση" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_en-GB.html b/chrome/installer/setup/eula/oem_en-GB.html index ccd8319..3e94b28 100755 --- a/chrome/installer/setup/eula/oem_en-GB.html +++ b/chrome/installer/setup/eula/oem_en-GB.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="Accept and Run" /> <input type="submit" name="cancel" value="Cancel" />
+ <input type="submit" name="submit" value="Accept and Run" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="Cancel" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_en.html b/chrome/installer/setup/eula/oem_en.html index d331d3a..b1f177e 100644 --- a/chrome/installer/setup/eula/oem_en.html +++ b/chrome/installer/setup/eula/oem_en.html @@ -45,7 +45,7 @@ </table>
<div class="buttons">
<input type="submit" name="submit" value="Accept and Run" />
- <input type="submit" name="cancel" value="Cancel" />
+ <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="Cancel" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_es-419.html b/chrome/installer/setup/eula/oem_es-419.html index 21db0e0..bb8eeaa0 100755 --- a/chrome/installer/setup/eula/oem_es-419.html +++ b/chrome/installer/setup/eula/oem_es-419.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="Aceptar y ejecutar" /> <input type="submit" name="cancel" value="Cancelar" />
+ <input type="submit" name="submit" value="Aceptar y ejecutar" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="Cancelar" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_es.html b/chrome/installer/setup/eula/oem_es.html index 460806b..6cacb4d 100755 --- a/chrome/installer/setup/eula/oem_es.html +++ b/chrome/installer/setup/eula/oem_es.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="Aceptar y ejecutar" /> <input type="submit" name="cancel" value="Cancelar" />
+ <input type="submit" name="submit" value="Aceptar y ejecutar" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="Cancelar" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_et.html b/chrome/installer/setup/eula/oem_et.html index 9b1828a..c3067c2 100755 --- a/chrome/installer/setup/eula/oem_et.html +++ b/chrome/installer/setup/eula/oem_et.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="Kinnita ja käivita" /> <input type="submit" name="cancel" value="Tühista" />
+ <input type="submit" name="submit" value="Kinnita ja käivita" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="Tühista" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_fi.html b/chrome/installer/setup/eula/oem_fi.html index 9e66754..8d74097 100755 --- a/chrome/installer/setup/eula/oem_fi.html +++ b/chrome/installer/setup/eula/oem_fi.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="Hyväksy ja suorita" /> <input type="submit" name="cancel" value="Peruuta" />
+ <input type="submit" name="submit" value="Hyväksy ja suorita" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="Peruuta" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_fil.html b/chrome/installer/setup/eula/oem_fil.html index 7dc4c36..e27d8b2 100755 --- a/chrome/installer/setup/eula/oem_fil.html +++ b/chrome/installer/setup/eula/oem_fil.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="Sumang-ayon at Patakbuhin" /> <input type="submit" name="cancel" value="Kanselahin" />
+ <input type="submit" name="submit" value="Sumang-ayon at Patakbuhin" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="Kanselahin" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_fr.html b/chrome/installer/setup/eula/oem_fr.html index 7fbdc0b..6a652f45 100755 --- a/chrome/installer/setup/eula/oem_fr.html +++ b/chrome/installer/setup/eula/oem_fr.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="Accepter et installer" /> <input type="submit" name="cancel" value="Annuler" />
+ <input type="submit" name="submit" value="Accepter et installer" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="Annuler" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_hi.html b/chrome/installer/setup/eula/oem_hi.html index 0592420..860c8a2 100755 --- a/chrome/installer/setup/eula/oem_hi.html +++ b/chrome/installer/setup/eula/oem_hi.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="स्वीकार करें और चलाएँ" /> <input type="submit" name="cancel" value="रद्द करें" />
+ <input type="submit" name="submit" value="स्वीकार करें और चलाएँ" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="रद्द करें" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_hr.html b/chrome/installer/setup/eula/oem_hr.html index d0b3cd4..e7af7bc 100755 --- a/chrome/installer/setup/eula/oem_hr.html +++ b/chrome/installer/setup/eula/oem_hr.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="Prihvati i pokreni" /> <input type="submit" name="cancel" value="Odustani" />
+ <input type="submit" name="submit" value="Prihvati i pokreni" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="Odustani" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_hu.html b/chrome/installer/setup/eula/oem_hu.html index 586b770..6c6789e 100755 --- a/chrome/installer/setup/eula/oem_hu.html +++ b/chrome/installer/setup/eula/oem_hu.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="Elfogadás és futtatás" /> <input type="submit" name="cancel" value="Mégse" />
+ <input type="submit" name="submit" value="Elfogadás és futtatás" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="Mégse" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_id.html b/chrome/installer/setup/eula/oem_id.html index be52378..2ed2063 100755 --- a/chrome/installer/setup/eula/oem_id.html +++ b/chrome/installer/setup/eula/oem_id.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="Setujui dan Jalankan" /> <input type="submit" name="cancel" value="Batal" />
+ <input type="submit" name="submit" value="Setujui dan Jalankan" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="Batal" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_it.html b/chrome/installer/setup/eula/oem_it.html index eb98924..27fac15 100755 --- a/chrome/installer/setup/eula/oem_it.html +++ b/chrome/installer/setup/eula/oem_it.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="Accetta e installa" /> <input type="submit" name="cancel" value="Annulla" />
+ <input type="submit" name="submit" value="Accetta e installa" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="Annulla" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_iw.html b/chrome/installer/setup/eula/oem_iw.html index 18d73c0..3666b57 100755 --- a/chrome/installer/setup/eula/oem_iw.html +++ b/chrome/installer/setup/eula/oem_iw.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="קבל והפעל" /> <input type="submit" name="cancel" value="בטל" />
+ <input type="submit" name="submit" value="קבל והפעל" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="בטל" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_ja.html b/chrome/installer/setup/eula/oem_ja.html index 2b503c5..b59cbed 100755 --- a/chrome/installer/setup/eula/oem_ja.html +++ b/chrome/installer/setup/eula/oem_ja.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="同意と実行" /> <input type="submit" name="cancel" value="キャンセル" />
+ <input type="submit" name="submit" value="同意と実行" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="キャンセル" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_ko.html b/chrome/installer/setup/eula/oem_ko.html index bf9fc0f..5ad3cb5 100755 --- a/chrome/installer/setup/eula/oem_ko.html +++ b/chrome/installer/setup/eula/oem_ko.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="동의 및 설치" /> <input type="submit" name="cancel" value="취소" />
+ <input type="submit" name="submit" value="동의 및 설치" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="취소" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_lt.html b/chrome/installer/setup/eula/oem_lt.html index 5fc93b0..d609094 100755 --- a/chrome/installer/setup/eula/oem_lt.html +++ b/chrome/installer/setup/eula/oem_lt.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="Patvirtinti ir paleisti" /> <input type="submit" name="cancel" value="Atšaukti" />
+ <input type="submit" name="submit" value="Patvirtinti ir paleisti" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="Atšaukti" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_lv.html b/chrome/installer/setup/eula/oem_lv.html index da3d1f1..14ad8e9 100755 --- a/chrome/installer/setup/eula/oem_lv.html +++ b/chrome/installer/setup/eula/oem_lv.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="Piekrist un izpildīt" /> <input type="submit" name="cancel" value="Atcelt" />
+ <input type="submit" name="submit" value="Piekrist un izpildīt" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="Atcelt" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_nl.html b/chrome/installer/setup/eula/oem_nl.html index 2b29d22..afb2d19 100755 --- a/chrome/installer/setup/eula/oem_nl.html +++ b/chrome/installer/setup/eula/oem_nl.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="Accepteren en uitvoeren" /> <input type="submit" name="cancel" value="Annuleren" />
+ <input type="submit" name="submit" value="Accepteren en uitvoeren" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="Annuleren" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_no.html b/chrome/installer/setup/eula/oem_no.html index 094fac0..d65e6ef 100755 --- a/chrome/installer/setup/eula/oem_no.html +++ b/chrome/installer/setup/eula/oem_no.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="Godta og kjør" /> <input type="submit" name="cancel" value="Avbryt" />
+ <input type="submit" name="submit" value="Godta og kjør" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="Avbryt" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_pl.html b/chrome/installer/setup/eula/oem_pl.html index d321e2c..0dd5b89 100755 --- a/chrome/installer/setup/eula/oem_pl.html +++ b/chrome/installer/setup/eula/oem_pl.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="Zaakceptuj i uruchom" /> <input type="submit" name="cancel" value="Anuluj" />
+ <input type="submit" name="submit" value="Zaakceptuj i uruchom" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="Anuluj" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_pt-BR.html b/chrome/installer/setup/eula/oem_pt-BR.html index 2ac30c0..cbef8e4 100755 --- a/chrome/installer/setup/eula/oem_pt-BR.html +++ b/chrome/installer/setup/eula/oem_pt-BR.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="Aceitar e executar" /> <input type="submit" name="cancel" value="Cancelar" />
+ <input type="submit" name="submit" value="Aceitar e executar" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="Cancelar" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_pt-PT.html b/chrome/installer/setup/eula/oem_pt-PT.html index 3f4c0f4..b5f6623 100755 --- a/chrome/installer/setup/eula/oem_pt-PT.html +++ b/chrome/installer/setup/eula/oem_pt-PT.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="Aceitar e instalar" /> <input type="submit" name="cancel" value="Cancelar" />
+ <input type="submit" name="submit" value="Aceitar e instalar" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="Cancelar" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_ro.html b/chrome/installer/setup/eula/oem_ro.html index 76559eb..095f937 100755 --- a/chrome/installer/setup/eula/oem_ro.html +++ b/chrome/installer/setup/eula/oem_ro.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="Acceptaţi şi rulaţi" /> <input type="submit" name="cancel" value="Anulaţi" />
+ <input type="submit" name="submit" value="Acceptaţi şi rulaţi" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="Anulaţi" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_ru.html b/chrome/installer/setup/eula/oem_ru.html index 4a45eac..013160c 100755 --- a/chrome/installer/setup/eula/oem_ru.html +++ b/chrome/installer/setup/eula/oem_ru.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="Принять условия и запустить" /> <input type="submit" name="cancel" value="Отмена" />
+ <input type="submit" name="submit" value="Принять условия и запустить" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="Отмена" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_sk.html b/chrome/installer/setup/eula/oem_sk.html index a7cc193..baf8b02 100755 --- a/chrome/installer/setup/eula/oem_sk.html +++ b/chrome/installer/setup/eula/oem_sk.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="Prijať a spustiť" /> <input type="submit" name="cancel" value="Zrušiť" />
+ <input type="submit" name="submit" value="Prijať a spustiť" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="Zrušiť" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_sl.html b/chrome/installer/setup/eula/oem_sl.html index 14b059e..130d5e2 100755 --- a/chrome/installer/setup/eula/oem_sl.html +++ b/chrome/installer/setup/eula/oem_sl.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="Sprejmi in zaženi" /> <input type="submit" name="cancel" value="Prekliči" />
+ <input type="submit" name="submit" value="Sprejmi in zaženi" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="Prekliči" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_sr.html b/chrome/installer/setup/eula/oem_sr.html index 683293a..5164b53 100755 --- a/chrome/installer/setup/eula/oem_sr.html +++ b/chrome/installer/setup/eula/oem_sr.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="Прихвати и инсталирај" /> <input type="submit" name="cancel" value="Откажи" />
+ <input type="submit" name="submit" value="Прихвати и инсталирај" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="Откажи" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_sv.html b/chrome/installer/setup/eula/oem_sv.html index fcb865e..f390bb3 100755 --- a/chrome/installer/setup/eula/oem_sv.html +++ b/chrome/installer/setup/eula/oem_sv.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="Godkänn och kör" /> <input type="submit" name="cancel" value="Avbryt" />
+ <input type="submit" name="submit" value="Godkänn och kör" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="Avbryt" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_th.html b/chrome/installer/setup/eula/oem_th.html index 0ed7c2a..7074c3f 100755 --- a/chrome/installer/setup/eula/oem_th.html +++ b/chrome/installer/setup/eula/oem_th.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="ยอมรับและเรียกใช้" /> <input type="submit" name="cancel" value="ยกเลิก" />
+ <input type="submit" name="submit" value="ยอมรับและเรียกใช้" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="ยกเลิก" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_tr.html b/chrome/installer/setup/eula/oem_tr.html index 9b0bfee..4228ea7 100755 --- a/chrome/installer/setup/eula/oem_tr.html +++ b/chrome/installer/setup/eula/oem_tr.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="Kabul Et ve Çalıştır" /> <input type="submit" name="cancel" value="İptal" />
+ <input type="submit" name="submit" value="Kabul Et ve Çalıştır" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="İptal" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_uk.html b/chrome/installer/setup/eula/oem_uk.html index da517dc..00e527d 100755 --- a/chrome/installer/setup/eula/oem_uk.html +++ b/chrome/installer/setup/eula/oem_uk.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="Прийняти та запустити" /> <input type="submit" name="cancel" value="Скасувати" />
+ <input type="submit" name="submit" value="Прийняти та запустити" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="Скасувати" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_vi.html b/chrome/installer/setup/eula/oem_vi.html index 0313131..8b14ba9 100755 --- a/chrome/installer/setup/eula/oem_vi.html +++ b/chrome/installer/setup/eula/oem_vi.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="Chấp nhận và Chạy" /> <input type="submit" name="cancel" value="Huỷ" />
+ <input type="submit" name="submit" value="Chấp nhận và Chạy" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="Huỷ" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_zh-CN.html b/chrome/installer/setup/eula/oem_zh-CN.html index 06d3859..d0e4b2e 100755 --- a/chrome/installer/setup/eula/oem_zh-CN.html +++ b/chrome/installer/setup/eula/oem_zh-CN.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="接受并运行" /> <input type="submit" name="cancel" value="取消" />
+ <input type="submit" name="submit" value="接受并运行" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="取消" />
</div>
</form>
</div>
diff --git a/chrome/installer/setup/eula/oem_zh-TW.html b/chrome/installer/setup/eula/oem_zh-TW.html index b8b98fa..e634b26 100755 --- a/chrome/installer/setup/eula/oem_zh-TW.html +++ b/chrome/installer/setup/eula/oem_zh-TW.html @@ -39,7 +39,7 @@ </tr>
</table>
<div class="buttons">
- <input type="submit" name="submit" value="接受並執行" /> <input type="submit" name="cancel" value="取消" />
+ <input type="submit" name="submit" value="接受並執行" /> <input onClick="window.returnValue = 2; window.close();" type="button" name="cancel" value="取消" />
</div>
</form>
</div>
diff --git a/chrome/installer/util/html_dialog_impl.cc b/chrome/installer/util/html_dialog_impl.cc index 80fb112..2bbf57a 100644 --- a/chrome/installer/util/html_dialog_impl.cc +++ b/chrome/installer/util/html_dialog_impl.cc @@ -174,7 +174,7 @@ EulaHTMLDialog::~EulaHTMLDialog() { bool EulaHTMLDialog::ShowModal() { Customizer customizer; HTMLDialog::DialogResult dr = dialog_->ShowModal(NULL, &customizer); - return (HTMLDialog::HTML_DLG_ACCEPT == dr); + return (HTMLDialog::HTML_DLG_ACCEPT == dr || HTMLDialog::HTML_DLG_EXTRA == dr); } } // namespace installer |