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

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

Issue 2737083002: [MD settings] show icon when slider controlled by something (Closed)
Patch Set: touch up Created 3 years, 9 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
OLDNEW
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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 </div> 107 </div>
108 </div> 108 </div>
109 <div class="settings-box embedded two-line"> 109 <div class="settings-box embedded two-line">
110 <div class="start textarea layout vertical"> 110 <div class="start textarea layout vertical">
111 <div>$i18n{displayResolutionTitle}</div> 111 <div>$i18n{displayResolutionTitle}</div>
112 <div class="secondary layout self-start"> 112 <div class="secondary layout self-start">
113 [[getResolutionText_(selectedDisplay, selectedModeIndex_)]] 113 [[getResolutionText_(selectedDisplay, selectedModeIndex_)]]
114 </div> 114 </div>
115 </div> 115 </div>
116 <cr-slider disabled="[[!enableSetResolution_(selectedDisplay)]]" 116 <cr-slider disabled="[[!enableSetResolution_(selectedDisplay)]]"
117 tick-values="[[modeValues_]]" value="{{selectedModeIndex_}}" 117 tick-values="[[modeValues_]]" pref="{{pref}}"
118 on-change="onSelectedModeChange_"> 118 on-change="onSelectedModeChange_">
119 </cr-slider> 119 </cr-slider>
120 </div> 120 </div>
121 <div class="settings-box embedded"> 121 <div class="settings-box embedded">
122 <div class="start textarea">$i18n{displayOrientation}</div> 122 <div class="start textarea">$i18n{displayOrientation}</div>
123 <div class="md-select-wrapper"> 123 <div class="md-select-wrapper">
124 <select class="md-select" value="[[selectedDisplay.rotation]]" 124 <select class="md-select" value="[[selectedDisplay.rotation]]"
125 on-change="onOrientationChange_"> 125 on-change="onOrientationChange_">
126 <option value="0">$i18n{displayOrientationStandard}</option> 126 <option value="0">$i18n{displayOrientationStandard}</option>
127 <option value="90">90</option> 127 <option value="90">90</option>
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 </div> 160 </div>
161 </div> 161 </div>
162 <button class="subpage-arrow" is="paper-icon-button-light" 162 <button class="subpage-arrow" is="paper-icon-button-light"
163 aria-label="$i18n{displayTouchCalibrationTitle}" 163 aria-label="$i18n{displayTouchCalibrationTitle}"
164 aria-describedby="touchCalibrationSecondary"></button> 164 aria-describedby="touchCalibrationSecondary"></button>
165 </div> 165 </div>
166 </div> 166 </div>
167 </template> 167 </template>
168 <script src="display.js"></script> 168 <script src="display.js"></script>
169 </dom-module> 169 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698