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/paper-styles/color.html "> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html "> |
| 7 | 7 |
| 8 <!-- | 8 <!-- |
| 9 OOBE Welcome screen | 9 OOBE Welcome screen |
| 10 --> | 10 --> |
| 11 <dom-module id="oobe-welcome-dialog"> | 11 <dom-module id="oobe-welcome-dialog"> |
| 12 <template> | 12 <template> |
| 13 <link rel="stylesheet" href="oobe_dialog_host.css"> | 13 <link rel="stylesheet" href="oobe_dialog_host.css"> |
| 14 <link rel="stylesheet" href="oobe_welcome_dialog.css"> | 14 <link rel="stylesheet" href="oobe_welcome_dialog.css"> |
| 15 <div class="layout horizontal flex"> | 15 <div class="layout horizontal flex"> |
| 16 <div class="vertical-margin"></div> | 16 <div class="vertical-margin"></div> |
| 17 <div class="welcome-content flex layout vertical center"> | 17 <div class="welcome-content flex layout vertical center"> |
| 18 <h1 id="title" i18n-content="networkScreenGreeting"></h1> | 18 <h1 id="title" i18n-content="networkScreenGreeting"></h1> |
| 19 <img id="welcomeIllustration" | 19 <img id="welcomeIllustration" |
| 20 srcset="images/welcome_illustration_1x.png 1x, | 20 srcset="images/welcome_illustration_1x.png 1x, |
| 21 images/welcome_illustration_2x.png 2x"> | 21 images/welcome_illustration_2x.png 2x"> |
| 22 <div hidden="[[!debuggingLinkVisible]]"> | 22 <div hidden="[[!debuggingLinkVisible]]"> |
| 23 <a href="#" i18n-content="debuggingFeaturesLink" | 23 <a href="#" i18n-content="debuggingFeaturesLink" |
| 24 on-tap="onDebuggingLinkClicked_"></a> | 24 on-tap="onDebuggingLinkClicked_"></a> |
| 25 </div> | 25 </div> |
| 26 <div class="flex"></div> | 26 <div class="flex"></div> |
| 27 <div id="buttons" class="layout horizontal center"> | 27 <div id="buttons" class="layout horizontal center"> |
| 28 <oobe-welcome-secondary-button id="languageSelectionButton" | 28 <oobe-welcome-secondary-button id="languageSelectionButton" |
| 29 icon="icons:language" on-tap="onLanguageClicked_" | 29 icon1x="oobe-welcome-32:language" |
|
jdufault
2017/03/15 16:51:40
I'm okay with leaving as is because being explicit
| |
| 30 icon2x="oobe-welcome-64:language" | |
| 31 on-tap="onLanguageClicked_" | |
| 30 label-for-aria$="[[formatMessage_('languageButtonLabel', | 32 label-for-aria$="[[formatMessage_('languageButtonLabel', |
| 31 currentLanguage)]]"> | 33 currentLanguage)]]"> |
| 32 <div>[[currentLanguage]]</div> | 34 <div>[[currentLanguage]]</div> |
| 33 </oobe-welcome-secondary-button> | 35 </oobe-welcome-secondary-button> |
| 34 <oobe-welcome-secondary-button id="accessibilitySettingsButton" | 36 <oobe-welcome-secondary-button id="accessibilitySettingsButton" |
| 35 icon="icons:accessibility" on-tap="onAccessibilityClicked_"> | 37 icon1x="oobe-welcome-32:accessibility" |
| 38 icon2x="oobe-welcome-64:accessibility" | |
| 39 on-tap="onAccessibilityClicked_"> | |
| 36 <div i18n-content="accessibilityLink"></div> | 40 <div i18n-content="accessibilityLink"></div> |
| 37 </oobe-welcome-secondary-button> | 41 </oobe-welcome-secondary-button> |
| 38 <oobe-welcome-secondary-button id="timezoneSettingsButton" | 42 <oobe-welcome-secondary-button id="timezoneSettingsButton" |
| 39 icon="oobe-welcome-64:timezone" on-tap="onTimezoneClicked_" | 43 icon1x="oobe-welcome-32:timezone" |
| 44 icon2x="oobe-welcome-64:timezone" | |
| 45 on-tap="onTimezoneClicked_" | |
| 40 hidden="[[!timezoneButtonVisible]]"> | 46 hidden="[[!timezoneButtonVisible]]"> |
| 41 <div i18n-content="timezoneButtonText"></div> | 47 <div i18n-content="timezoneButtonText"></div> |
| 42 </oobe-welcome-secondary-button> | 48 </oobe-welcome-secondary-button> |
| 43 <div class="flex"></div> | 49 <div class="flex"></div> |
| 44 <oobe-text-button id="welcomeNextButton" | 50 <oobe-text-button id="welcomeNextButton" |
| 45 inverse on-tap="onNextClicked_"> | 51 inverse on-tap="onNextClicked_"> |
| 46 <div i18n-content="welcomeNextButtonText"></div> | 52 <div i18n-content="welcomeNextButtonText"></div> |
| 47 </oobe-text-button> | 53 </oobe-text-button> |
| 48 </div> | 54 </div> |
| 49 <div id="bottom-margin"></div> | 55 <div id="bottom-margin"></div> |
| 50 </div> | 56 </div> |
| 51 <div class="vertical-margin"></div> | 57 <div class="vertical-margin"></div> |
| 52 </div> | 58 </div> |
| 53 </template> | 59 </template> |
| 54 </dom-module> | 60 </dom-module> |
| OLD | NEW |