Use OutputConfigurator::SetDislpayMode for ctrl-fullscreen

ash/display/display_controller.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 "ash/display/display_controller.h"
 
 #include <algorithm>
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_manager.h"
@@ skipping 539 matching lines @@
 }
 
 void DisplayController::CycleDisplayMode() {
   if (limiter_.get()) {
     if  (limiter_->IsThrottled())
       return;
     limiter_->SetThrottleTimeout(kCycleDisplayThrottleTimeoutMs);
   }
 #if defined(OS_CHROMEOS)
   Shell* shell = Shell::GetInstance();
+  internal::DisplayManager* display_manager = GetDisplayManager();
   if (!base::chromeos::IsRunningOnChromeOS()) {
     internal::DisplayManager::CycleDisplay();
-  } else if (shell->output_configurator()->connected_output_count() > 1) {
+  } else if (display_manager->num_connected_displays() > 1) {
+    chromeos::OutputState new_state = display_manager->IsMirrored() ?
+       chromeos::STATE_DUAL_EXTENDED : chromeos::STATE_DUAL_MIRROR;
     internal::OutputConfiguratorAnimation* animation =
         shell->output_configurator_animation();
     animation->StartFadeOutAnimation(base::Bind(
-        base::IgnoreResult(&chromeos::OutputConfigurator::CycleDisplayMode),
-        base::Unretained(shell->output_configurator())));
+        base::IgnoreResult(&chromeos::OutputConfigurator::SetDisplayMode),
+        base::Unretained(shell->output_configurator()),
+        new_state));
   }
 #endif
 }
 
 void DisplayController::SwapPrimaryDisplay() {
   if (limiter_.get()) {
     if  (limiter_->IsThrottled())
       return;
     limiter_->SetThrottleTimeout(kSwapDisplayThrottleTimeoutMs);
   }
@@ skipping 294 matching lines @@
 }
 
 void DisplayController::OnFadeOutForSwapDisplayFinished() {
 #if defined(OS_CHROMEOS)
   SetPrimaryDisplay(ScreenAsh::GetSecondaryDisplay());
   Shell::GetInstance()->output_configurator_animation()->StartFadeInAnimation();
 #endif
 }
 
 }  // namespace ash