Fix display switching for extended displays.

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>
 
 // Xlib defines Status as int which causes our include of dbus/bus.h to fail
 // when it tries to name an enum Status.  Thus, we need to undefine it (note
 // that this will cause a problem if code needs to use the Status type).
 // RootWindow causes similar problems in that there is a Chromium type with that
 // name.
 #undef Status
 #undef RootWindow
 
+#include "ash/display/display_controller.h"
 #include "base/chromeos/chromeos_version.h"
 #include "base/logging.h"
 #include "base/message_pump_aurax11.h"
 #include "base/metrics/histogram.h"
 #include "base/perftimer.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "dbus/bus.h"
 #include "dbus/exported_object.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
@@ skipping 626 matching lines @@
       }
     }
   }
 
   return state;
 }
 
 bool OutputConfigurator::CycleDisplayMode() {
   VLOG(1) << "CycleDisplayMode";
   bool did_change = false;
+
+  // The next state to go into if the current state is dual primary.
+  State next_state_from_dual_primary = STATE_DUAL_SECONDARY_ONLY;
+  if (ash::internal::DisplayController::IsExtendedDesktopEnabled()) {

[oshima, 2012/07/25 23:44:20]

/chromeos can't depend on /ash.Can you let ash switch the mode in output
configurator instead? (like SetEnbableSecondaryOnly())

[rkc, 2012/07/25 23:59:37]

Done.

+    if (mirror_supported_) {
+      next_state_from_dual_primary = STATE_DUAL_MIRROR;
+    } else {
+      // In case mirror is not supported, stay in the
+      // extended desktop primary display.
+      next_state_from_dual_primary = STATE_INVALID;
+    }
+  }
+
   if (is_running_on_chrome_os_) {
     // Rules:
     // - if there are 0 or 1 displays, do nothing and return false.
     // - use y-coord of CRTCs to determine if we are mirror, primary-first, or
     // secondary-first.  The cycle order is:
     //   mirror->primary->secondary->mirror.
     State new_state = STATE_INVALID;
     switch (output_state_) {
       case STATE_DUAL_MIRROR:
         new_state = STATE_DUAL_PRIMARY_ONLY;
         break;
       case STATE_DUAL_PRIMARY_ONLY:
-        new_state = STATE_DUAL_SECONDARY_ONLY;
+        new_state = next_state_from_dual_primary;
         break;
       case STATE_DUAL_SECONDARY_ONLY:
         new_state = mirror_supported_ ?
             STATE_DUAL_MIRROR :
             STATE_DUAL_PRIMARY_ONLY;
         break;
       default:
         // Do nothing - we aren't in a mode which we can rotate.
         break;
     }
@@ skipping 130 matching lines @@
       power_manager::kSetIsProjectingMethod);
   dbus::MessageWriter writer(&method_call);
   writer.AppendBool(is_projecting);
   power_manager_proxy->CallMethod(
       &method_call,
       dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
       dbus::ObjectProxy::EmptyResponseCallback());
 }
 
 }  // namespace chromeos