diff options
Diffstat (limited to 'chromeos/display/output_configurator.cc')
| -rw-r--r-- | chromeos/display/output_configurator.cc | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/chromeos/display/output_configurator.cc b/chromeos/display/output_configurator.cc index 6fb573a..66a5b17 100644 --- a/chromeos/display/output_configurator.cc +++ b/chromeos/display/output_configurator.cc @@ -255,9 +255,11 @@ static int GetDualOutputs(Display* display, to_populate->mirror_mode = 0; // See if this output refers to an internal display. + // TODO(oshmia): Use |IsInternalOutputName| once the change is merged + // to m23. crbug.com/152003. + const std::string name(output_info->name); to_populate->is_internal = - OutputConfigurator::IsInternalOutputName( - std::string(output_info->name)); + name.find(kInternal_LVDS) == 0 || name.find(kInternal_eDP) == 0; VLOG(1) << "Found display #" << found_count << " with output " << (int)to_populate->output @@ -375,8 +377,13 @@ static OutputState GetNextState(Display* display, (0 != outputs[1].mirror_mode); switch (current_state) { case STATE_DUAL_PRIMARY_ONLY: - state = - mirror_supported ? STATE_DUAL_MIRROR : STATE_DUAL_PRIMARY_ONLY; + // TODO(oshima): Temporarily disable extended + // desktop. crbug.com/152003. + state = STATE_DUAL_SECONDARY_ONLY; + break; + case STATE_DUAL_SECONDARY_ONLY: + state = mirror_supported ? + STATE_DUAL_MIRROR : STATE_DUAL_PRIMARY_ONLY; break; case STATE_DUAL_MIRROR: state = STATE_DUAL_PRIMARY_ONLY; @@ -834,7 +841,9 @@ void OutputConfigurator::RemoveObserver(Observer* observer) { // static bool OutputConfigurator::IsInternalOutputName(const std::string& name) { - return name.find(kInternal_LVDS) == 0 || name.find(kInternal_eDP) == 0; + // TODO(oshima): There is only one display for m23 and no need to + // distinguish internal display. + return false; } void OutputConfigurator::NotifyOnDisplayChanged() { |