| OLD | NEW |
| 1 <!-- Copyright 2016 The Chromium Authors. All rights reserved. | 1 <!-- Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 Use of this source code is governed by a BSD-style license that can be | 2 Use of this source code is governed by a BSD-style license that can be |
| 3 found in the LICENSE file. --> | 3 found in the LICENSE file. --> |
| 4 | 4 |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe
s/iron-flex-layout.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe
s/iron-flex-layout.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm
l"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm
l"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-iconset-svg/iron-i
conset-svg.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-iconset-svg/iron-i
conset-svg.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch
eckbox.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch
eckbox.html"> |
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html
"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html
"> |
| 10 | 10 |
| 11 <iron-iconset-svg name="oobe-eula" size="24"> | 11 <iron-iconset-svg name="oobe-eula-32" size="32"> |
| 12 <svg> | 12 <svg> |
| 13 <defs> | 13 <defs> |
| 14 <!-- The Google "G" icon (copied from md-settings). --> | 14 <!-- The Google "G" icon. --> |
| 15 <g id="googleg"> | 15 <g id="googleg" fill="none" fill-rule="evenodd"> |
| 16 <path fill="#4285F4" d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92
c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09z"></path> | 16 <path d="M30.42 16.83c0-1.03-.092-2.017-.264-2.966H16.5v5.61h7.804c-.336
1.81-1.358 3.347-2.894 4.375v3.637h4.686c2.742-2.524 4.324-6.242 4.324-10.657z"
fill="#4285F4"></path> |
| 17 <path fill="#34A853" d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98
.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 1
2 23z"></path> | 17 <path d="M16.5 31c3.915 0 7.197-1.298 9.596-3.513L21.41 23.85c-1.298.87-
2.96 1.383-4.91 1.383-3.777 0-6.973-2.55-8.113-5.978H3.542v3.757C5.928 27.752 10
.832 31 16.5 31z" fill="#34A853"></path> |
| 18 <path fill="#FBBC05" d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.
35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22.81-.62z"><
/path> | 18 <path d="M8.387 19.255c-.29-.87-.455-1.8-.455-2.755 0-.956.165-1.885.455
-2.755V9.988H3.542C2.56 11.946 2 14.16 2 16.5s.56 4.554 1.542 6.512l4.845-3.757z
" fill="#FBBC05"></path> |
| 19 <path fill="#EA4335" d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.4
5 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.
53z"></path> | 19 <path d="M16.5 7.767c2.13 0 4.04.732 5.543 2.168l4.16-4.158C23.69 3.437
20.407 2 16.5 2 10.832 2 5.928 5.25 3.542 9.988l4.845 3.757c1.14-3.427 4.336-5.9
78 8.113-5.978z" fill="#EA4335"></path> |
| 20 <path fill="none" d="M1 1h22v22H1z"></path> | 20 <path d="M2 2h29v29H2"></path> |
| 21 </g> | 21 </g> |
| 22 </defs> | 22 </defs> |
| 23 </svg> | 23 </svg> |
| 24 </iron-iconset-svg> |
| 25 |
| 26 <iron-iconset-svg name="oobe-eula-64" size="64"> |
| 27 <svg> |
| 28 <defs> |
| 29 <!-- The Google "G" icon. --> |
| 30 <g id="googleg" fill="none" fill-rule="evenodd"> |
| 31 <path d="M59.84 32.66c0-2.057-.185-4.035-.527-5.933H32v11.218h15.607c-.6
72 3.625-2.715 6.696-5.787 8.753v7.276h9.373c5.483-5.05 8.647-12.483 8.647-21.31
5z" fill="#4285F4"></path> |
| 32 <path d="M32 61c7.83 0 14.395-2.597 19.193-7.026l-9.373-7.276c-2.596 1.7
4-5.918 2.768-9.82 2.768-7.553 0-13.946-5.1-16.227-11.956H6.085v7.514C10.855 54.
5 20.665 61 32 61z" fill="#34A853"></path> |
| 33 <path d="M15.773 37.51c-.58-1.74-.91-3.6-.91-5.51 0-1.91.33-3.77.91-5.51
v-7.514H6.085C4.12 22.89 3 27.32 3 32s1.12 9.11 3.085 13.024l9.688-7.514z" fill=
"#FBBC05"></path> |
| 34 <path d="M32 14.534c4.258 0 8.08 1.463 11.086 4.337l8.318-8.317C46.38 5.
873 39.817 3 32 3 20.664 3 10.856 9.5 6.085 18.976l9.688 7.514c2.28-6.855 8.674-
11.956 16.227-11.956z" fill="#EA4335"></path> |
| 35 <path d="M3 3h58v58H3"></path> |
| 36 </g> |
| 37 </defs> |
| 38 </svg> |
| 24 </iron-iconset-svg> | 39 </iron-iconset-svg> |
| 25 | 40 |
| 26 <dom-module id="oobe-eula-md"> | 41 <dom-module id="oobe-eula-md"> |
| 27 <template> | 42 <template> |
| 28 <link rel="stylesheet" href="oobe_eula.css"> | 43 <link rel="stylesheet" href="oobe_eula.css"> |
| 29 <link rel="stylesheet" href="oobe_dialog_parameters.css"> | 44 <link rel="stylesheet" href="oobe_dialog_parameters.css"> |
| 30 <oobe-dialog id="eulaLoadingDialog" hidden="[[!eulaLoadingScreenShown]]" | 45 <oobe-dialog id="eulaLoadingDialog" hidden="[[!eulaLoadingScreenShown]]" |
| 31 role="dialog" aria-label$="$i18n{termsOfServiceLoading}" | 46 role="dialog" aria-label$="$i18n{termsOfServiceLoading}" |
| 32 has-buttons> | 47 has-buttons> |
| 33 <iron-icon icon="oobe-eula:googleg" class="oobe-icon"></iron-icon> | 48 <iron-icon icon="oobe-eula:googleg" class="oobe-icon"></iron-icon> |
| 34 <div class="header"> | 49 <div class="header"> |
| 35 <h1 class="title" i18n-content="termsOfServiceLoading"></h1> | 50 <h1 class="title" i18n-content="termsOfServiceLoading"></h1> |
| 36 </div> | 51 </div> |
| 37 </oobe-dialog> | 52 </oobe-dialog> |
| 38 <oobe-dialog id="eulaDialog" hidden="[[eulaLoadingScreenShown]]" | 53 <oobe-dialog id="eulaDialog" hidden="[[eulaLoadingScreenShown]]" |
| 39 role="dialog" aria-label$="$i18n{oobeEulaSectionTitle}" | 54 role="dialog" aria-label$="$i18n{oobeEulaSectionTitle}" |
| 40 has-buttons> | 55 has-buttons> |
| 41 <iron-icon icon="oobe-eula:googleg" class="oobe-icon"></iron-icon> | 56 <hd-iron-icon class="oobe-icon" |
| 57 icon1x="oobe-eula-32:googleg" icon2x="oobe-eula-64:googleg"> |
| 58 </hd-iron-icon> |
| 42 <div class="header"> | 59 <div class="header"> |
| 43 <h1 class="title" i18n-content="oobeEulaSectionTitle"></h1> | 60 <h1 class="title" i18n-content="oobeEulaSectionTitle"></h1> |
| 44 </div> | 61 </div> |
| 45 <div class="footer flex layout vertical"> | 62 <div class="footer flex layout vertical"> |
| 46 <iframe id="crosEulaFrame" src="chrome://terms" | 63 <iframe id="crosEulaFrame" src="chrome://terms" |
| 47 role="document" class="flex focus-on-show" | 64 role="document" class="flex focus-on-show" |
| 48 aria-label$="$i18n{oobeEulaIframeLabel}" | 65 aria-label$="$i18n{oobeEulaIframeLabel}" |
| 49 on-load="onFrameLoad_"> | 66 on-load="onFrameLoad_"> |
| 50 </iframe> | 67 </iframe> |
| 51 <a id="installationSettings" href="#" | 68 <a id="installationSettings" href="#" |
| (...skipping 21 matching lines...) Expand all Loading... |
| 73 <oobe-text-button id="eula-accept-button" inverse on-tap="eulaAccepted_" | 90 <oobe-text-button id="eula-accept-button" inverse on-tap="eulaAccepted_" |
| 74 disabled="[[acceptButtonDisabled]]"> | 91 disabled="[[acceptButtonDisabled]]"> |
| 75 <div i18n-content="oobeEulaAcceptAndContinueButtonText" | 92 <div i18n-content="oobeEulaAcceptAndContinueButtonText" |
| 76 id="accept-button-text"> | 93 id="accept-button-text"> |
| 77 </div> | 94 </div> |
| 78 </oobe-text-button> | 95 </oobe-text-button> |
| 79 </div> | 96 </div> |
| 80 </oobe-dialog> | 97 </oobe-dialog> |
| 81 </template> | 98 </template> |
| 82 </dom-module> | 99 </dom-module> |
| OLD | NEW |