diff options
| author | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-13 04:38:28 +0000 |
|---|---|---|
| committer | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-13 04:38:28 +0000 |
| commit | 4bf2619fe9a26abeac4a89fc4272c42efaaa506a (patch) | |
| tree | 9af37027c6268e9fd0eb3dbbafbb67149270162f | |
| parent | b24833cb63d806e8445d35a605d93fe0e94d5731 (diff) | |
| download | chromium_src-4bf2619fe9a26abeac4a89fc4272c42efaaa506a.zip chromium_src-4bf2619fe9a26abeac4a89fc4272c42efaaa506a.tar.gz chromium_src-4bf2619fe9a26abeac4a89fc4272c42efaaa506a.tar.bz2 | |
Do not show overscan calibration UI for internal display.
BUG=165754
Review URL: https://chromiumcodereview.appspot.com/11555034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172819 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/resources/options/chromeos/display_options.js | 5 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/options/chromeos/display_options_handler.cc | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/resources/options/chromeos/display_options.js b/chrome/browser/resources/options/chromeos/display_options.js index ba17152..38afbbf 100644 --- a/chrome/browser/resources/options/chromeos/display_options.js +++ b/chrome/browser/resources/options/chromeos/display_options.js @@ -851,7 +851,10 @@ cr.define('options', function() { resolutionElement.removeChild(resolutionElement.firstChild); resolutionElement.appendChild(document.createTextNode(resolutionData)); - if (this.overscanCalibrator_) { + if (display.isInternal) { + $('start-calibrating-overscan-control').hidden = true; + $('end-calibrating-overscan-control').hidden = true; + } else if (this.overscanCalibrator_) { $('start-calibrating-overscan-control').hidden = true; $('end-calibrating-overscan-control').hidden = false; } else { diff --git a/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc index ddc4475..e4e62a13 100644 --- a/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc @@ -153,6 +153,8 @@ void DisplayOptionsHandler::SendDisplayInfo() { js_display->SetString("name", display_manager->GetDisplayNameFor(*display)); js_display->SetBoolean("isPrimary", display->id() == primary_id); + js_display->SetBoolean("isInternal", + display_manager->IsInternalDisplayId(display->id())); base::DictionaryValue* js_insets = new base::DictionaryValue(); const gfx::Insets& insets = display_controller->GetOverscanInsets(display->id()); |