| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.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/polymer/v1_0/iron-flex-layout/classe
s/iron-flex-layout.html"> | 4 <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/paper-button/paper-butt
on.html"> | 5 <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-icon-button/paper
-icon-button-light.html"> | 6 <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-tabs/paper-tabs.h
tml"> | 7 <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-toggle-button/pap
er-toggle-button.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap
er-toggle-button.html"> |
| 9 <link rel="import" href="display_layout.html"> | 9 <link rel="import" href="display_layout.html"> |
| 10 <link rel="import" href="display_overscan_dialog.html"> | 10 <link rel="import" href="display_overscan_dialog.html"> |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 <paper-toggle-button checked="[[unifiedDesktopMode_]]" | 111 <paper-toggle-button checked="[[unifiedDesktopMode_]]" |
| 112 on-tap="onUnifiedDesktopTap_" | 112 on-tap="onUnifiedDesktopTap_" |
| 113 aria-labelledby="displayUnifiedDesktopCheckboxLabel"> | 113 aria-labelledby="displayUnifiedDesktopCheckboxLabel"> |
| 114 </paper-toggle-button> | 114 </paper-toggle-button> |
| 115 </div> | 115 </div> |
| 116 </template> | 116 </template> |
| 117 | 117 |
| 118 <template is="dom-if" restamp | 118 <template is="dom-if" restamp |
| 119 if="[[showDisplaySelectMenu_(displays, selectedDisplay)]]"> | 119 if="[[showDisplaySelectMenu_(displays, selectedDisplay)]]"> |
| 120 <div class="settings-box embedded"> | 120 <div class="settings-box embedded"> |
| 121 <div class="start">$i18n{displayScreenTitle}</div> | 121 <div id="displayScreenTitle" class="start"> |
| 122 $i18n{displayScreenTitle} |
| 123 </div> |
| 122 <div class="md-select-wrapper"> | 124 <div class="md-select-wrapper"> |
| 123 <select class="md-select" on-change="updatePrimaryDisplay_" | 125 <select class="md-select" on-change="updatePrimaryDisplay_" |
| 126 aria-labelledby="displayScreenTitle" |
| 124 value="[[getDisplaySelectMenuIndex_( | 127 value="[[getDisplaySelectMenuIndex_( |
| 125 selectedDisplay, primaryDisplayId)]]"> | 128 selectedDisplay, primaryDisplayId)]]"> |
| 126 <option value="0">$i18n{displayScreenPrimary}</option> | 129 <option value="0">$i18n{displayScreenPrimary}</option> |
| 127 <option value="1">$i18n{displayScreenExtended}</option> | 130 <option value="1">$i18n{displayScreenExtended}</option> |
| 128 </select> | 131 </select> |
| 129 <span class="md-select-underline"></span> | 132 <span class="md-select-underline"></span> |
| 130 </div> | 133 </div> |
| 131 </div> | 134 </div> |
| 132 </template> | 135 </template> |
| 133 | 136 |
| 134 <div class="settings-box embedded two-line"> | 137 <div class="settings-box embedded two-line"> |
| 135 <div class="start textarea layout vertical"> | 138 <div class="start textarea layout vertical"> |
| 136 <div>$i18n{displayResolutionTitle}</div> | 139 <div>$i18n{displayResolutionTitle}</div> |
| 137 <div class="secondary layout self-start"> | 140 <div class="secondary layout self-start"> |
| 138 [[getResolutionText_(selectedDisplay, selectedModePref_.value)]] | 141 [[getResolutionText_(selectedDisplay, selectedModePref_.value)]] |
| 139 </div> | 142 </div> |
| 140 </div> | 143 </div> |
| 141 <settings-slider disabled="[[!enableSetResolution_(selectedDisplay)]]" | 144 <settings-slider disabled="[[!enableSetResolution_(selectedDisplay)]]" |
| 142 tick-values="[[modeValues_]]" pref="{{selectedModePref_}}" | 145 tick-values="[[modeValues_]]" pref="{{selectedModePref_}}" |
| 143 on-change="onSelectedModeChange_"> | 146 on-change="onSelectedModeChange_"> |
| 144 </settings-slider> | 147 </settings-slider> |
| 145 </div> | 148 </div> |
| 146 | 149 |
| 147 <template is="dom-if" if="[[!unifiedDesktopMode_]]" restamp> | 150 <template is="dom-if" if="[[!unifiedDesktopMode_]]" restamp> |
| 148 <div class="settings-box embedded"> | 151 <div class="settings-box embedded"> |
| 149 <div class="start textarea">$i18n{displayOrientation}</div> | 152 <div id="displayOrientation" class="start textarea"> |
| 153 $i18n{displayOrientation} |
| 154 </div> |
| 150 <div class="md-select-wrapper"> | 155 <div class="md-select-wrapper"> |
| 151 <select class="md-select" value="[[selectedDisplay.rotation]]" | 156 <select class="md-select" value="[[selectedDisplay.rotation]]" |
| 157 aria-labelledby="displayOrientation" |
| 152 on-change="onOrientationChange_"> | 158 on-change="onOrientationChange_"> |
| 153 <option value="0">$i18n{displayOrientationStandard}</option> | 159 <option value="0">$i18n{displayOrientationStandard}</option> |
| 154 <option value="90">90</option> | 160 <option value="90">90</option> |
| 155 <option value="180">180</option> | 161 <option value="180">180</option> |
| 156 <option value="270">270</option> | 162 <option value="270">270</option> |
| 157 </select> | 163 </select> |
| 158 <span class="md-select-underline"></span> | 164 <span class="md-select-underline"></span> |
| 159 </div> | 165 </div> |
| 160 </div> | 166 </div> |
| 161 </template> | 167 </template> |
| (...skipping 27 matching lines...) Expand all Loading... |
| 189 </div> | 195 </div> |
| 190 </div> | 196 </div> |
| 191 <button class="subpage-arrow" is="paper-icon-button-light" | 197 <button class="subpage-arrow" is="paper-icon-button-light" |
| 192 aria-label="$i18n{displayTouchCalibrationTitle}" | 198 aria-label="$i18n{displayTouchCalibrationTitle}" |
| 193 aria-describedby="touchCalibrationSecondary"></button> | 199 aria-describedby="touchCalibrationSecondary"></button> |
| 194 </div> | 200 </div> |
| 195 </div> | 201 </div> |
| 196 </template> | 202 </template> |
| 197 <script src="display.js"></script> | 203 <script src="display.js"></script> |
| 198 </dom-module> | 204 </dom-module> |
| OLD | NEW |