1 files changed, 23 insertions, 0 deletions
diff --git a/chromium/chrome/browser/resources/options/chromeos/display_options.js b/chromium/chrome/browser/resources/options/chromeos/display_options.js
index 3b000ca283e..e0285c26fd4 100644
--- a/chromium/chrome/browser/resources/options/chromeos/display_options.js
+++ b/chromium/chrome/browser/resources/options/chromeos/display_options.js
@@ -178,12 +178,18 @@ cr.define('options', function() {
         chrome.send('setOrientation', [this.displays_[this.focusedIndex_].id,
                                        ev.target.value]);
       }.bind(this);
+      $('display-options-color-profile-selection').onchange = function(ev) {
+        chrome.send('setColorProfile', [this.displays_[this.focusedIndex_].id,
+                                        ev.target.value]);
+      }.bind(this);
       $('selected-display-start-calibrating-overscan').onclick = function() {
         // Passes the target display ID. Do not specify it through URL hash,
         // we do not care back/forward.
         var displayOverscan = options.DisplayOverscan.getInstance();
         displayOverscan.setDisplayId(this.displays_[this.focusedIndex_].id);
         OptionsPage.navigateToPage('displayOverscan');
+        chrome.send('coreOptionsUserMetricsAction',
+                    ['Options_DisplaySetOverscan']);
       }.bind(this);
 
       chrome.send('getDisplayInfo');
@@ -628,6 +634,23 @@ cr.define('options', function() {
         }
         resolution.disabled = (display.resolutions.length <= 1);
       }
+
+      if (display.availableColorProfiles.length <= 1) {
+        $('selected-display-color-profile-row').hidden = true;
+      } else {
+        $('selected-display-color-profile-row').hidden = false;
+        var profiles = $('display-options-color-profile-selection');
+        profiles.innerHTML = '';
+        for (var i = 0; i < display.availableColorProfiles.length; i++) {
+          var option = document.createElement('option');
+          var colorProfile = display.availableColorProfiles[i];
+          option.value = colorProfile.profileId;
+          option.textContent = colorProfile.name;
+          option.selected = (
+              display.colorProfile == colorProfile.profileId);
+          profiles.appendChild(option);
+        }
+      }
     },
 
     /**