Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(209)

Side by Side Diff: chrome/browser/resources/chromeos/login/oobe_eula.html

Issue 2688153004: ChromeOS OOBE: fix focus flow in MD-OOBE. (Closed)
Patch Set: Rebased. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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" size="24">
12 <svg> 12 <svg>
13 <defs> 13 <defs>
14 <!-- The Google "G" icon (copied from md-settings). --> 14 <!-- The Google "G" icon (copied from md-settings). -->
15 <g id="googleg"> 15 <g id="googleg">
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 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>
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 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>
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 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>
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 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>
20 <path fill="none" d="M1 1h22v22H1z"></path> 20 <path fill="none" d="M1 1h22v22H1z"></path>
21 </g> 21 </g>
22 </defs> 22 </defs>
23 </svg> 23 </svg>
24 </iron-iconset-svg> 24 </iron-iconset-svg>
25 25
26 <dom-module name="oobe-eula-md"> 26 <dom-module name="oobe-eula-md">
27 <template> 27 <template>
28 <link rel="stylesheet" href="oobe_eula.css"> 28 <link rel="stylesheet" href="oobe_eula.css">
29 <link rel="stylesheet" href="oobe_dialog_parameters.css"> 29 <link rel="stylesheet" href="oobe_dialog_parameters.css">
30 <oobe-dialog hidden="[[!eulaLoadingScreenShown]]" 30 <oobe-dialog id="eulaLoadingDialog" hidden="[[!eulaLoadingScreenShown]]"
31 role="dialog" aria-label="$i18n{termsOfServiceLoading}"
31 has-buttons> 32 has-buttons>
32 <iron-icon icon="oobe-eula:googleg" class="oobe-icon"></iron-icon> 33 <iron-icon icon="oobe-eula:googleg" class="oobe-icon"></iron-icon>
33 <div class="header"> 34 <div class="header">
34 <h1 class="title" i18n-content="termsOfServiceLoading"></h1> 35 <h1 class="title" i18n-content="termsOfServiceLoading"></h1>
35 </div> 36 </div>
36 </oobe-dialog> 37 </oobe-dialog>
37 <oobe-dialog hidden="[[!eulaScreenShown]]" 38 <oobe-dialog id="eulaDialog" hidden="[[eulaLoadingScreenShown]]"
39 role="dialog" aria-label="$i18n{oobeEulaSectionTitle}"
38 has-buttons> 40 has-buttons>
39 <iron-icon icon="oobe-eula:googleg" class="oobe-icon"></iron-icon> 41 <iron-icon icon="oobe-eula:googleg" class="oobe-icon"></iron-icon>
40 <div class="header"> 42 <div class="header">
41 <h1 class="title" i18n-content="oobeEulaSectionTitle"></h1> 43 <h1 class="title" i18n-content="oobeEulaSectionTitle"></h1>
42 </div> 44 </div>
43 <div class="footer flex layout vertical"> 45 <div class="footer flex layout vertical">
44 <iframe id="crosEulaFrame" class="flex" src="chrome://terms" 46 <iframe id="crosEulaFrame" src="chrome://terms"
47 role="document" class="flex focus-on-show"
48 aria-label="$i18n{oobeEulaIframeLabel}"
45 on-load="onFrameLoad_"> 49 on-load="onFrameLoad_">
46 </iframe> 50 </iframe>
47 <a id="installationSettings" href="#" 51 <a id="installationSettings" href="#"
48 on-tap="onInstallationSettingsClicked_" 52 on-tap="onInstallationSettingsClicked_"
49 i18n-content="eulaSystemInstallationSettings"> 53 i18n-content="eulaSystemInstallationSettings">
50 </a> 54 </a>
51 <div id="logging"> 55 <div id="logging">
52 <paper-checkbox aria-labelledby="usage-stats-label" id="usageStats" 56 <paper-checkbox aria-labelledby="usage-stats-label" id="usageStats"
53 checked="{{usageStatsChecked}}" on-change="onUsageChanged_"> 57 checked="{{usageStatsChecked}}" on-change="onUsageChanged_">
54 <label id="usage-stats-label" i18n-content="checkboxLogging"> 58 <label id="usage-stats-label" i18n-content="checkboxLogging">
(...skipping 12 matching lines...) Expand all
67 <oobe-text-button id="eula-accept-button" inverse on-tap="eulaAccepted_" 71 <oobe-text-button id="eula-accept-button" inverse on-tap="eulaAccepted_"
68 disabled="[[acceptButtonDisabled]]"> 72 disabled="[[acceptButtonDisabled]]">
69 <div i18n-content="oobeEulaAcceptAndContinueButtonText" 73 <div i18n-content="oobeEulaAcceptAndContinueButtonText"
70 id="accept-button-text"> 74 id="accept-button-text">
71 </div> 75 </div>
72 </oobe-text-button> 76 </oobe-text-button>
73 </div> 77 </div>
74 </oobe-dialog> 78 </oobe-dialog>
75 </template> 79 </template>
76 </dom-module> 80 </dom-module>
OLDNEW
« no previous file with comments | « chrome/browser/resources/chromeos/login/oobe_dialog.js ('k') | chrome/browser/resources/chromeos/login/oobe_eula.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698