Chromium Code Reviews| 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 | 8 |
| 9 <iron-iconset-svg name="oobe-eula" size="24"> | 9 <iron-iconset-svg name="oobe-eula" size="24"> |
| 10 <svg> | 10 <svg> |
| 11 <defs> | 11 <defs> |
| 12 <!-- The Google "G" icon (copied from md-settings). --> | 12 <!-- The Google "G" icon (copied from md-settings). --> |
| 13 <g id="googleg"> | 13 <g id="googleg"> |
| 14 <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> | 14 <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> |
| 15 <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> | 15 <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> |
| 16 <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> | 16 <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> |
| 17 <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> | 17 <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> |
| 18 <path fill="none" d="M1 1h22v22H1z"></path> | 18 <path fill="none" d="M1 1h22v22H1z"></path> |
| 19 </g> | 19 </g> |
| 20 </defs> | 20 </defs> |
| 21 </svg> | 21 </svg> |
| 22 </iron-iconset-svg> | 22 </iron-iconset-svg> |
| 23 | 23 |
| 24 <dom-module name="oobe-eula-md"> | 24 <dom-module name="oobe-eula-md"> |
| 25 <link rel="stylesheet" href="oobe_eula.css"> | |
| 26 <template> | 25 <template> |
| 26 <link rel="stylesheet" href="oobe_eula.css"> | |
| 27 <link rel="stylesheet" href="oobe_dialog_parameters.css"> | |
| 27 <oobe-dialog class="fit" hidden="[[!eulaLoadingScreenShown]]" | 28 <oobe-dialog class="fit" hidden="[[!eulaLoadingScreenShown]]" |
| 28 has-buttons> | 29 has-buttons> |
| 29 <iron-icon icon="oobe-eula:googleg" class="oobe-icon"></iron-icon> | 30 <iron-icon icon="oobe-eula:googleg" class="oobe-icon"></iron-icon> |
| 30 <div class="header flex layout vertical end-justified start"> | 31 <div class="header"> |
| 31 <h1 class="welcome-message" i18n-content="termsOfServiceLoading"></h1> | 32 <h1 class="title" i18n-content="termsOfServiceLoading"></h1> |
| 32 </div> | 33 </div> |
| 33 </oobe-dialog> | 34 </oobe-dialog> |
| 34 <oobe-dialog class="fit" hidden="[[!eulaScreenShown]]" | 35 <oobe-dialog class="fit" hidden="[[!eulaScreenShown]]" |
| 35 has-buttons> | 36 has-buttons> |
| 36 <iron-icon icon="oobe-eula:googleg" class="oobe-icon"></iron-icon> | 37 <iron-icon icon="oobe-eula:googleg" class="oobe-icon"></iron-icon> |
| 37 <div class="header flex layout vertical end-justified start"> | 38 <div class="header"> |
| 38 <h1 class="welcome-message" i18n-content="oobeEulaSectionTitle"></h1> | 39 <h1 class="title" i18n-content="oobeEulaSectionTitle"></h1> |
| 39 </div> | 40 </div> |
| 40 <div class="footer layout vertical"> | 41 <div class="footer flex layout vertical"> |
| 41 <div id="cros-eula"> | 42 <iframe id="crosEulaFrame" class="flex" src="chrome://terms" |
| 42 <iframe id="crosEulaFrame" name="cros-eula-frame" class="eula-frame" | 43 on-load="onFrameLoad_"> |
| 43 src="chrome://terms" on-load="onFrameLoad_"> | 44 </iframe> |
| 44 </iframe> | |
| 45 </div> | |
| 46 </div> | 45 </div> |
| 47 <div class="bottom-buttons layout horizontal"> | 46 <div class="bottom-buttons flex layout horizontal"> |
| 47 <div class="flex"><!-- spacer to align button to the right --></div> | |
|
michaelpg
2016/08/19 06:10:49
still think this can be done without a spacer elem
Alexander Alekseev
2016/08/19 06:25:43
Done.
(I missed this)
| |
| 48 <oobe-text-button inverse on-tap="eulaAccepted_" | 48 <oobe-text-button inverse on-tap="eulaAccepted_" |
| 49 i18n-content="oobeEulaAcceptAndContinueButtonText" | 49 i18n-content="oobeEulaAcceptAndContinueButtonText" |
| 50 disabled="[[acceptButtonDisabled]]"> | 50 disabled="[[acceptButtonDisabled]]"> |
| 51 </oobe-text-button> | 51 </oobe-text-button> |
| 52 </div> | 52 </div> |
| 53 </oobe-dialog> | 53 </oobe-dialog> |
| 54 </template> | 54 </template> |
| 55 </dom-module> | 55 </dom-module> |
| OLD | NEW |