diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-10 18:39:05 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-10 18:39:05 +0000 |
| commit | 8f120f285ec488852f06f2b0b5d8a665560ffa33 (patch) | |
| tree | e7218e7a9b649d21551e22649f136513e478fc43 /chrome | |
| parent | 764ab69a59db6cb8936c3ccd1ce560b3fd872833 (diff) | |
| download | chromium_src-8f120f285ec488852f06f2b0b5d8a665560ffa33.zip chromium_src-8f120f285ec488852f06f2b0b5d8a665560ffa33.tar.gz chromium_src-8f120f285ec488852f06f2b0b5d8a665560ffa33.tar.bz2 | |
Revert 176089
This patch appears to be responsible for failures on multiple Chrome OS bots.
> Only show start/stop mirroring button when there are multiple displays.
>
> Also, redirect the page to chrome://settings when only one monitor is
> connected, so we can stop showing the dialog for now. In the future
> we may decide to show the page for some reason.
>
> BUG=169124
> TEST=manually on parrot
>
> Review URL: https://codereview.chromium.org/11818043
TBR=hshi@google.com
Review URL: https://codereview.chromium.org/11824070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176113 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/resources/options/chromeos/display_options.js | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/chrome/browser/resources/options/chromeos/display_options.js b/chrome/browser/resources/options/chromeos/display_options.js index 25a9336..38afbbf 100644 --- a/chrome/browser/resources/options/chromeos/display_options.js +++ b/chrome/browser/resources/options/chromeos/display_options.js @@ -835,7 +835,6 @@ cr.define('options', function() { $('selected-display-data-container').hidden = true; $('display-configuration-arrow').hidden = true; $('display-options-set-primary').hidden = true; - $('display-options-toggle-mirroring').hidden = true; return; } @@ -874,8 +873,6 @@ cr.define('options', function() { $('display-options-set-primary').hidden = this.displays_[this.focusedIndex_].isPrimary; - $('display-options-toggle-mirroring').hidden = - (this.displays_.length <= 1); }, /** @@ -1053,11 +1050,6 @@ cr.define('options', function() { * @private */ onDisplayChanged_: function(mirroring, displays, layout, offset) { - if (displays.length <= 1) { - OptionsPage.showDefaultPage(); - return; - } - this.mirroring_ = mirroring; this.layout_ = layout; this.offset_ = offset; |