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

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

Issue 2587913007: MD Settings: cr-slider: Make display consistent and clean up. (Closed)
Patch Set: Update tests Created 3 years, 12 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/html/i18n_behavior.html"> 2 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
2 <link rel="import" href="chrome://resources/html/md_select_css.html"> 3 <link rel="import" href="chrome://resources/html/md_select_css.html">
3 <link rel="import" href="chrome://resources/html/polymer.html"> 4 <link rel="import" href="chrome://resources/html/polymer.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/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"> 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-checkbox/paper-ch eckbox.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.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-icon-button/paper -icon-button-light.html">
8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-slider/paper-slid er.html">
9 <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-tabs/paper-tabs.h tml">
10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">
11 <link rel="import" href="/device_page/display_layout.html"> 11 <link rel="import" href="/device_page/display_layout.html">
12 <link rel="import" href="/device_page/display_overscan_dialog.html"> 12 <link rel="import" href="/device_page/display_overscan_dialog.html">
13 <link rel="import" href="/settings_shared_css.html"> 13 <link rel="import" href="/settings_shared_css.html">
14 <link rel="import" href="/settings_vars_css.html"> 14 <link rel="import" href="/settings_vars_css.html">
15 15
16 <dom-module id="settings-display"> 16 <dom-module id="settings-display">
17 <template> 17 <template>
18 <style include="settings-shared md-select"> 18 <style include="settings-shared md-select">
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 <option value="0">$i18n{displayScreenPrimary}</option> 102 <option value="0">$i18n{displayScreenPrimary}</option>
103 <option value="1">$i18n{displayScreenExtended}</option> 103 <option value="1">$i18n{displayScreenExtended}</option>
104 </select> 104 </select>
105 <span class="md-select-underline"></span> 105 <span class="md-select-underline"></span>
106 </div> 106 </div>
107 </div> 107 </div>
108 <div class="settings-box embedded two-line"> 108 <div class="settings-box embedded two-line">
109 <div class="start textarea layout vertical"> 109 <div class="start textarea layout vertical">
110 <div>$i18n{displayResolutionTitle}</div> 110 <div>$i18n{displayResolutionTitle}</div>
111 <div class="secondary layout self-start"> 111 <div class="secondary layout self-start">
112 [[getResolutionText_(selectedDisplay, immediateSelectedModeIndex_)]] 112 [[getResolutionText_(selectedDisplay, selectedModeIndex_)]]
113 </div> 113 </div>
114 </div> 114 </div>
115 <paper-slider snaps max-markers="100" step="1" 115 <cr-slider disabled="[[!enableSetResolution_(selectedDisplay)]]"
116 disabled="[[!enableSetResolution_(selectedDisplay)]]" 116 tick-values="[[modeValues_]]" value="{{selectedModeIndex_}}"
117 min="0" max="[[maxModeIndex_]]" 117 on-change="onSelectedModeChange_">
118 value="[[selectedModeIndex_]]" 118 </cr-slider>
119 immediate-value="{{immediateSelectedModeIndex_}}"
120 on-change="onChangeMode_">
121 </paper-slider>
122 </div> 119 </div>
123 <div class="settings-box embedded"> 120 <div class="settings-box embedded">
124 <div class="start textarea">$i18n{displayOrientation}</div> 121 <div class="start textarea">$i18n{displayOrientation}</div>
125 <div class="md-select-wrapper"> 122 <div class="md-select-wrapper">
126 <select class="md-select" value="[[selectedDisplay.rotation]]" 123 <select class="md-select" value="[[selectedDisplay.rotation]]"
127 on-change="onOrientationChange_"> 124 on-change="onOrientationChange_">
128 <option value="0">$i18n{displayOrientationStandard}</option> 125 <option value="0">$i18n{displayOrientationStandard}</option>
129 <option value="90">90</option> 126 <option value="90">90</option>
130 <option value="180">180</option> 127 <option value="180">180</option>
131 <option value="270">270</option> 128 <option value="270">270</option>
(...skipping 12 matching lines...) Expand all
144 </div> 141 </div>
145 142
146 <settings-display-overscan-dialog id="displayOverscan" 143 <settings-display-overscan-dialog id="displayOverscan"
147 display-id="{{overscanDisplayId}}"> 144 display-id="{{overscanDisplayId}}">
148 </settings-display-overscan-dialog> 145 </settings-display-overscan-dialog>
149 146
150 </div> 147 </div>
151 </template> 148 </template>
152 <script src="display.js"></script> 149 <script src="display.js"></script>
153 </dom-module> 150 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698