Chromium Code Reviews| Index: chromeos/display/output_configurator.cc |
| diff --git a/chromeos/display/output_configurator.cc b/chromeos/display/output_configurator.cc |
| index 6fb573a37b4646d9c84023d22922e4dad912e0cc..c55f25675341f8c27940f2318c7beac16b32276d 100644 |
| --- a/chromeos/display/output_configurator.cc |
| +++ b/chromeos/display/output_configurator.cc |
| @@ -375,8 +375,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 +839,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; |
|
Josh Horwich
2012/09/25 00:06:52
Will the fact that we will now always have IsProje
|
| } |
| void OutputConfigurator::NotifyOnDisplayChanged() { |