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

Side by Side Diff: chrome/browser/resources/settings/device_page/display.html

Issue 2775193005: Fix display resolution label (Closed)
Patch Set: . Created 3 years, 8 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 <option value="0">$i18n{displayScreenPrimary}</option> 98 <option value="0">$i18n{displayScreenPrimary}</option>
99 <option value="1">$i18n{displayScreenExtended}</option> 99 <option value="1">$i18n{displayScreenExtended}</option>
100 </select> 100 </select>
101 <span class="md-select-underline"></span> 101 <span class="md-select-underline"></span>
102 </div> 102 </div>
103 </div> 103 </div>
104 <div class="settings-box embedded two-line"> 104 <div class="settings-box embedded two-line">
105 <div class="start textarea layout vertical"> 105 <div class="start textarea layout vertical">
106 <div>$i18n{displayResolutionTitle}</div> 106 <div>$i18n{displayResolutionTitle}</div>
107 <div class="secondary layout self-start"> 107 <div class="secondary layout self-start">
108 [[getResolutionText_(selectedDisplay, selectedModeIndex_)]] 108 [[getResolutionText_(selectedDisplay, selectedModePref_.value)]]
109 </div> 109 </div>
110 </div> 110 </div>
111 <settings-slider disabled="[[!enableSetResolution_(selectedDisplay)]]" 111 <settings-slider disabled="[[!enableSetResolution_(selectedDisplay)]]"
112 tick-values="[[modeValues_]]" pref="{{selectedModePref_}}" 112 tick-values="[[modeValues_]]" pref="{{selectedModePref_}}"
113 on-change="onSelectedModeChange_"> 113 on-change="onSelectedModeChange_">
114 </settings-slider> 114 </settings-slider>
115 </div> 115 </div>
116 <div class="settings-box embedded"> 116 <div class="settings-box embedded">
117 <div class="start textarea">$i18n{displayOrientation}</div> 117 <div class="start textarea">$i18n{displayOrientation}</div>
118 <div class="md-select-wrapper"> 118 <div class="md-select-wrapper">
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 </div> 155 </div>
156 </div> 156 </div>
157 <button class="subpage-arrow" is="paper-icon-button-light" 157 <button class="subpage-arrow" is="paper-icon-button-light"
158 aria-label="$i18n{displayTouchCalibrationTitle}" 158 aria-label="$i18n{displayTouchCalibrationTitle}"
159 aria-describedby="touchCalibrationSecondary"></button> 159 aria-describedby="touchCalibrationSecondary"></button>
160 </div> 160 </div>
161 </div> 161 </div>
162 </template> 162 </template>
163 <script src="display.js"></script> 163 <script src="display.js"></script>
164 </dom-module> 164 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698