| Index: chrome/browser/resources/options/chromeos/display_options.js
|
| diff --git a/chrome/browser/resources/options/chromeos/display_options.js b/chrome/browser/resources/options/chromeos/display_options.js
|
| index e0285c26fd45887e75bd23ca0ebe7914fb277a9e..711a0b03c1a2498e6f99900b3dbd3461d1fa2324 100644
|
| --- a/chrome/browser/resources/options/chromeos/display_options.js
|
| +++ b/chrome/browser/resources/options/chromeos/display_options.js
|
| @@ -622,9 +622,15 @@ cr.define('options', function() {
|
| } else {
|
| for (var i = 0; i < display.resolutions.length; i++) {
|
| var option = document.createElement('option');
|
| + var width = display.resolutions[i].width;
|
| + var height = display.resolutions[i].height;
|
| + var scaleFactor = display.resolutions[i].scaleFactor;
|
| + if (display.resolutions[i].scaleFactor) {
|
| + width /= scaleFactor;
|
| + height /= scaleFactor;
|
| + }
|
| option.value = i;
|
| - option.textContent = display.resolutions[i].width + 'x' +
|
| - display.resolutions[i].height;
|
| + option.textContent = width + 'x' + height;
|
| if (display.resolutions[i].isBest) {
|
| option.textContent += ' ' +
|
| loadTimeData.getString('annotateBest');
|
|
|