chrome/browser/resources/chromeos/login/oobe_eula.html - Issue 2269433002: ChromeOS: Add more controls to OOBE EULA screen.

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

Issue 2269433002: ChromeOS: Add more controls to OOBE EULA screen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update. Created 4 years, 4 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

« chrome/browser/resources/chromeos/login/oobe_eula.css ('K') | « chrome/browser/resources/chromeos/login/oobe_eula.css ('k') | chrome/browser/resources/chromeos/login/oobe_eula.js » ('j') | chrome/browser/resources/chromeos/login/oobe_eula.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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">

	9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html ">

8	10

9 <iron-iconset-svg name="oobe-eula" size="24">	11 <iron-iconset-svg name="oobe-eula" size="24">

10 <svg>	12 <svg>

11 <defs>	13 <defs>

12 <!-- The Google "G" icon (copied from md-settings). -->	14 <!-- The Google "G" icon (copied from md-settings). -->

13 <g id="googleg">	15 <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>	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>

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>	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>

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>	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>

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>	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>

(...skipping 17 matching lines...) Expand all Loading...
35 <oobe-dialog class="fit" hidden="[[!eulaScreenShown]]"	37 <oobe-dialog class="fit" hidden="[[!eulaScreenShown]]"

36 has-buttons>	38 has-buttons>

37 <iron-icon icon="oobe-eula:googleg" class="oobe-icon"></iron-icon>	39 <iron-icon icon="oobe-eula:googleg" class="oobe-icon"></iron-icon>

38 <div class="header">	40 <div class="header">

39 <h1 class="title" i18n-content="oobeEulaSectionTitle"></h1>	41 <h1 class="title" i18n-content="oobeEulaSectionTitle"></h1>

40 </div>	42 </div>

41 <div class="footer flex layout vertical">	43 <div class="footer flex layout vertical">

42 <iframe id="crosEulaFrame" class="flex" src="chrome://terms"	44 <iframe id="crosEulaFrame" class="flex" src="chrome://terms"

43 on-load="onFrameLoad_">	45 on-load="onFrameLoad_">

44 </iframe>	46 </iframe>

	47 <a id="installationSettings" href="#"

	48 on-tap="onInstallationSettingsClicked_"

	49 i18n-content="eulaSystemInstallationSettings">

	50 </a>

	51 <div id="logging">

	52 <paper-checkbox aria-labelledby="usage-stats-label" id="usageStats"

	53 checked="[[usageStatsChecked]]" on-change="onUsageChanged_">
	stevenjb 2016/08/23 16:45:17 This does not appear to be disabled, should this b This does not appear to be disabled, should this be 'checked={{...}}' ? Alexander Alekseev 2016/08/25 01:28:22 Done. Show quoted text On 2016/08/23 16:45:17, stevenjb wrote: > This does not appear to be disabled, should this be 'checked={{...}}' ? Done.
	54 <label id="usage-stats-label" i18n-content="checkboxLogging">

	55 </label>

	56 <a id="" href="#" i18n-content="learnMore"

	57 on-tap="onUsageStatsHelpLinkClicked_">

	58 </a>

	59 </paper-checkbox>

	60 </div>

45 </div>	61 </div>

46 <div class="bottom-buttons flex layout horizontal end-justified">	62 <div class="bottom-buttons flex layout horizontal end-justified">

47 <oobe-text-button inverse on-tap="eulaAccepted_"	63 <oobe-text-button inverse on-tap="eulaAccepted_"

48 i18n-content="oobeEulaAcceptAndContinueButtonText"	64 i18n-content="oobeEulaAcceptAndContinueButtonText"

49 disabled="[[acceptButtonDisabled]]">	65 disabled="[[acceptButtonDisabled]]">

50 </oobe-text-button>	66 </oobe-text-button>

51 </div>	67 </div>

52 </oobe-dialog>	68 </oobe-dialog>

53 </template>	69 </template>

54 </dom-module>	70 </dom-module>

OLD	NEW