Start in extended desktop mode if it is enabled.

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 204 matching lines @@
 static float ComputeDeviceScaleFactor(unsigned int width,
                                       unsigned long mm_width) {
   float device_scale_factor = 1.0f;
   if (mm_width > 0 && (kMmInInch * width / mm_width) > kHighDensityDIPThreshold)
     device_scale_factor = 2.0f;
   return device_scale_factor;
 }
 
 }  // namespace
 
-OutputConfigurator::OutputConfigurator()
+OutputConfigurator::OutputConfigurator(bool is_extended_display_enabled)
     : is_running_on_chrome_os_(base::chromeos::IsRunningOnChromeOS()),
+      is_extended_display_enabled_(is_extended_display_enabled),
       output_count_(0),
       output_cache_(NULL),
       mirror_supported_(false),
       primary_output_index_(-1),
       secondary_output_index_(-1),
       xrandr_event_base_(0),
       output_state_(STATE_INVALID) {
   if (!is_running_on_chrome_os_)
     return;
   // Send the signal to powerd to tell it that we will take over output
@@ skipping 31 matching lines @@
   XRRQueryExtension(display, &xrandr_event_base_, &error_base_ignored);
   // Relinquish X resources.
   XRRFreeScreenResources(screen);
   XUngrabServer(display);
   CheckIsProjectingAndNotify();
 }
 
 OutputConfigurator::~OutputConfigurator() {
 }
 
-bool OutputConfigurator::CycleDisplayMode(bool extended_desktop_enabled) {
+bool OutputConfigurator::CycleDisplayMode() {
   VLOG(1) << "CycleDisplayMode";
   if (!is_running_on_chrome_os_)
     return false;
 
   bool did_change = false;
   // 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.
   // Note: If the extended desktop is enabled, the cycle order becomes,
   // mirror->extended->mirror
   OutputState new_state = STATE_INVALID;
   switch (output_state_) {
     case STATE_DUAL_MIRROR:
       new_state = STATE_DUAL_PRIMARY_ONLY;
       break;
     case STATE_DUAL_PRIMARY_ONLY:
-      if (extended_desktop_enabled) {
+      if (is_extended_display_enabled_) {
         if (mirror_supported_)
           new_state = STATE_DUAL_MIRROR;
         else
           new_state = STATE_INVALID;
       } else {
         new_state = STATE_DUAL_SECONDARY_ONLY;
       }
       break;
     case STATE_DUAL_SECONDARY_ONLY:
       new_state = mirror_supported_ ?
@@ skipping 406 matching lines @@
     UpdateCacheAndXrandrToState(display, screen, window, state);
   }
   XRRFreeScreenResources(screen);
   XUngrabServer(display);
   return did_detect_change;
 }
 
 OutputState OutputConfigurator::GetDefaultState() const {
   OutputState state = STATE_HEADLESS;
   if (-1 != primary_output_index_) {
-    if (-1 != secondary_output_index_)
-      state = mirror_supported_ ? STATE_DUAL_MIRROR : STATE_DUAL_PRIMARY_ONLY;
-    else
+    if (-1 != secondary_output_index_) {
+      if (is_extended_display_enabled_ || !mirror_supported_)
+        state = STATE_DUAL_PRIMARY_ONLY;
+      else
+        state = STATE_DUAL_MIRROR;
+    } else {
       state = STATE_SINGLE;
+    }
   }
   return state;
 }
 
 OutputState OutputConfigurator::InferCurrentState(
     Display* display, XRRScreenResources* screen) const {
   // STATE_INVALID will be our default or "unknown" state.
   OutputState state = STATE_INVALID;
   // First step:  count the number of connected outputs.
   if (secondary_output_index_ == -1) {
@@ skipping 94 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