Chromium Code Reviews| Index: chrome/browser/resources/chromeos/login/oobe_screen_eula.html |
| diff --git a/chrome/browser/resources/chromeos/login/oobe_screen_eula.html b/chrome/browser/resources/chromeos/login/oobe_screen_eula.html |
| index 590886c0220c507ffeb6564ffea42e9959d07340..acf7bf45a5a41e733bafc57c39490750aeb87a70 100644 |
| --- a/chrome/browser/resources/chromeos/login/oobe_screen_eula.html |
| +++ b/chrome/browser/resources/chromeos/login/oobe_screen_eula.html |
| @@ -1,49 +1,57 @@ |
| <div class="step right hidden animated eula-loading" id="eula" role="group" |
| i18n-values="aria-label:eulaScreenAccessibleTitle" hidden> |
| - <div class="step-contents"> |
| - <div id="eulas" class="eula-columns one-column"> |
| - <div id="cros-eula" tabindex="0"> |
| - <iframe id="cros-eula-frame" name="cros-eula-frame" class="eula-frame" |
| - src="about:blank"></iframe> |
| - <div id="cros-eula-loading"> |
| - <div> |
| - <p i18n-content="termsOfServiceLoading"></p> |
| + <div id="oobe-poly-eula" hidden> |
| + <oobe-eula-md id="oobe-eula-md" class="fit"> |
|
michaelpg
2016/08/15 16:16:49
nit: </ on same line if it fits
Alexander Alekseev
2016/08/15 19:36:43
Done.
|
| + </oobe-eula-md> |
| + </div> |
| + <div id="oobe-eula"> |
| + <div class="step-contents"> |
| + <div id="eulas" class="eula-columns one-column"> |
| + <div id="cros-eula" tabindex="0"> |
| + <iframe id="cros-eula-frame" name="cros-eula-frame" class="eula-frame" |
| + src="about:blank"></iframe> |
| + <div id="cros-eula-loading"> |
| + <div> |
| + <p i18n-content="termsOfServiceLoading"></p> |
| + </div> |
| </div> |
| </div> |
| + <div id="oem-eula"> |
| + <iframe id="oem-eula-frame" name="oem-eula-frame" class="eula-frame"> |
| + </iframe> |
| + </div> |
| </div> |
| - <div id="oem-eula"> |
| - <iframe id="oem-eula-frame" name="oem-eula-frame" class="eula-frame"></iframe> |
| + <div id="logging"> |
| + <div> |
| + <input aria-labelledby="usage-stats-label" id="usage-stats" |
| + type="checkbox"> |
| + </div> |
| + <div> |
| + <label id="usage-stats-label" i18n-content="checkboxLogging"></label> |
| + <a id="stats-help-link" href="#" i18n-content="learnMore"></a> |
| + </div> |
| </div> |
| </div> |
| - <div id="logging"> |
| - <div> |
| - <input id="usage-stats" type="checkbox"> |
| + <div id="eula-controls" class="step-controls"></div> |
| + <div id="eula-extra-controls" class="step-extra-controls"> |
| + <div id="installation-settings"> |
| + <a id="installation-settings-link" href="#" |
| + i18n-content="eulaSystemInstallationSettings"> |
| + </a> |
| </div> |
| - <div> |
| - <label for="usage-stats" i18n-content="checkboxLogging"></label> |
| - <a id="stats-help-link" href="#" i18n-content="learnMore"></a> |
| + <div id="eula-accessibility"> |
| + <a id="eula-accessibility-link" href="#" role="button" |
| + i18n-content="accessibilityLink"></a> |
| </div> |
| + <div id="eula-chrome-credits" |
| + class="credits"><a id="eula-chrome-credits-link" href="#" |
|
michaelpg
2016/08/15 16:16:49
why is this all mashed together
Alexander Alekseev
2016/08/15 19:36:43
This is actually a problem of upload. I only put o
|
| + role="button" i18n-content="chromeCreditsLink"></a></div> |
| + <div id="eula-chromeos-credits" |
| + class="credits"><a id="eula-chromeos-credits-link" href="#" |
| + role="button" i18n-content="chromeosCreditsLink"></a></div> |
| </div> |
| - </div> |
| - <div id="eula-controls" class="step-controls"></div> |
| - <div id="eula-extra-controls" class="step-extra-controls"> |
| - <div id="installation-settings"> |
| - <a id="installation-settings-link" href="#" |
| - i18n-content="eulaSystemInstallationSettings"> |
| - </a> |
| - </div> |
| - <div id="eula-accessibility"> |
| - <a id="eula-accessibility-link" href="#" role="button" |
| - i18n-content="accessibilityLink"></a> |
| + <div id="eula-busy" class="step-loading"> |
| + <div class="throbber"></div> |
| </div> |
| - <div id="eula-chrome-credits" |
| - class="credits"><a id="eula-chrome-credits-link" href="#" role="button" |
| - i18n-content="chromeCreditsLink"></a></div> |
| - <div id="eula-chromeos-credits" |
| - class="credits"><a id="eula-chromeos-credits-link" href="#" role="button" |
| - i18n-content="chromeosCreditsLink"></a></div> |
| - </div> |
| - <div id="eula-busy" class="step-loading"> |
| - <div class="throbber"></div> |
| </div> |
| </div> |