| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/cr_elements/cr_slider/cr_slider.html
"> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_slider/cr_slider.html
"> |
| 2 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 2 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 3 <link rel="import" href="chrome://resources/html/md_select_css.html"> | 3 <link rel="import" href="chrome://resources/html/md_select_css.html"> |
| 4 <link rel="import" href="chrome://resources/html/polymer.html"> | 4 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 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-button/paper-butt
on.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-tabs/paper-tabs.h
tml"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-tabs/paper-tabs.h
tml"> |
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap
er-toggle-button.html"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap
er-toggle-button.html"> |
| 10 <link rel="import" href="display_layout.html"> | 10 <link rel="import" href="display_layout.html"> |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 <option value="180">180</option> | 127 <option value="180">180</option> |
| 128 <option value="270">270</option> | 128 <option value="270">270</option> |
| 129 </select> | 129 </select> |
| 130 <span class="md-select-underline"></span> | 130 <span class="md-select-underline"></span> |
| 131 </div> | 131 </div> |
| 132 </div> | 132 </div> |
| 133 <div class="settings-box embedded two-line" | 133 <div class="settings-box embedded two-line" |
| 134 on-tap="onOverscanTap_" hidden$="[[selectedDisplay.isInternal]]" | 134 on-tap="onOverscanTap_" hidden$="[[selectedDisplay.isInternal]]" |
| 135 actionable> | 135 actionable> |
| 136 <div class="start"> | 136 <div class="start"> |
| 137 <div>$i18n{displayOverscanPageTitle}</div> | 137 $i18n{displayOverscanPageTitle} |
| 138 <div class="secondary">$i18n{displayOverscanPageText}</div> | 138 <div class="secondary" id="displayOverscanSecondary"> |
| 139 $i18n{displayOverscanPageText} |
| 140 </div> |
| 139 </div> | 141 </div> |
| 140 <button class="subpage-arrow" is="paper-icon-button-light"></button> | 142 <button class="subpage-arrow" is="paper-icon-button-light" |
| 143 aria-label="$i18n{displayOverscanPageTitle}" |
| 144 aria-describedby="displayOverscanSecondary"></button> |
| 141 </div> | 145 </div> |
| 142 | 146 |
| 143 <settings-display-overscan-dialog id="displayOverscan" | 147 <settings-display-overscan-dialog id="displayOverscan" |
| 144 display-id="{{overscanDisplayId}}"> | 148 display-id="{{overscanDisplayId}}"> |
| 145 </settings-display-overscan-dialog> | 149 </settings-display-overscan-dialog> |
| 146 | 150 |
| 147 <div class="settings-box embedded two-line" | 151 <div class="settings-box embedded two-line" |
| 148 on-tap="onTouchCalibrationTap_" | 152 on-tap="onTouchCalibrationTap_" |
| 149 hidden$="[[!showTouchCalibrationSetting_(selectedDisplay)]]" | 153 hidden$="[[!showTouchCalibrationSetting_(selectedDisplay)]]" |
| 150 actionable> | 154 actionable> |
| 151 <div class="start"> | 155 <div class="start"> |
| 152 <div>$i18n{displayTouchCalibrationTitle}</div> | 156 $i18n{displayTouchCalibrationTitle} |
| 153 <div class="secondary">$i18n{displayTouchCalibrationText}</div> | 157 <div class="secondary" id="touchCalibrationSecondary"> |
| 158 $i18n{displayTouchCalibrationText} |
| 159 </div> |
| 154 </div> | 160 </div> |
| 155 <button class="subpage-arrow" is="paper-icon-button-light"></button> | 161 <button class="subpage-arrow" is="paper-icon-button-light" |
| 162 aria-label="$i18n{displayTouchCalibrationTitle}" |
| 163 aria-describedby="touchCalibrationSecondary"></button> |
| 156 </div> | 164 </div> |
| 157 </div> | 165 </div> |
| 158 </template> | 166 </template> |
| 159 <script src="display.js"></script> | 167 <script src="display.js"></script> |
| 160 </dom-module> | 168 </dom-module> |
| OLD | NEW |