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

Unified Diff: ui/display/chromeos/display_configurator.cc

Issue 1652213002: Fix dock mode with 2+ external displays. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2623
Patch Set: Created 4 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/display/chromeos/update_display_configuration_task.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/display/chromeos/display_configurator.cc
diff --git a/ui/display/chromeos/display_configurator.cc b/ui/display/chromeos/display_configurator.cc
index 49a5f65830e32b507ef8fc79a2648ca324cef4a0..097760f1595b1da0684686aa8381112fb39dbe4b 100644
--- a/ui/display/chromeos/display_configurator.cc
+++ b/ui/display/chromeos/display_configurator.cc
@@ -303,11 +303,9 @@ bool DisplayConfigurator::DisplayLayoutManagerImpl::GetDisplayLayout(
case MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED:
case MULTIPLE_DISPLAY_STATE_MULTI_EXTENDED: {
if ((new_display_state == MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED &&
- states.size() != 2) ||
+ states.size() != 2 && num_on_displays != 2) ||
(new_display_state == MULTIPLE_DISPLAY_STATE_MULTI_EXTENDED &&
- states.size() <= 2) ||
- (num_on_displays != 0 &&
- num_on_displays != static_cast<int>(displays.size()))) {
+ num_on_displays <= 2)) {
LOG(WARNING) << "Ignoring request to enter extended mode with "
<< states.size() << " connected display(s) and "
<< num_on_displays << " turned on";
« no previous file with comments | « no previous file | ui/display/chromeos/update_display_configuration_task.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698