Disable extended desktop.

chromeos/display/output_configurator.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/display/output_configurator.h"
 
 #include <X11/Xlib.h>
 #include <X11/extensions/dpms.h>
 #include <X11/extensions/Xrandr.h>
 
@@ skipping 237 matching lines @@
         to_populate->height = 0;
         to_populate->y = 0;
       }
       // Find the native_mode and leave the mirror_mode for the pass after the
       // loop.
       if (output_info->nmode > 0)
         to_populate->native_mode = output_info->modes[0];
       to_populate->mirror_mode = 0;
 
       // See if this output refers to an internal display.
+      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;

[Josh Horwich, 2012/09/25 00:25:35]

nit: Should we add a TODO(oshima) comment here to switch back to
IsInternalOutputName when we undo this patch?

[oshima, 2012/09/25 01:43:18]

Done.

 
       VLOG(1) << "Found display #" << found_count
               << " with output " << (int)to_populate->output
               << " crtc " << (int)to_populate->crtc
               << " current mode " << (int)to_populate->current_mode;
       ++found_count;
     } else {
       XRRFreeOutputInfo(output_info);
     }
   }
@@ skipping 97 matching lines @@
       state = STATE_HEADLESS;
       break;
     case 1:
       state = STATE_SINGLE;
       break;
     case 2: {
       bool mirror_supported = (0 != outputs[0].mirror_mode) &&
           (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;
           break;
         default:
           // Unknown so just request something safe.
           state = STATE_DUAL_PRIMARY_ONLY;
       }
       break;
     }
@@ skipping 437 matching lines @@
 void OutputConfigurator::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void OutputConfigurator::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(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() {
   notification_timer_.reset();
   FOR_EACH_OBSERVER(Observer, observers_, OnDisplayModeChanged());
 }
 
 }  // namespace chromeos