Fix display switching for extended displays.

ash/accelerators/accelerator_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/accelerators/accelerator_controller.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 
@@ skipping 406 matching lines @@
       return HandleLock();
     case OPEN_FILE_MANAGER_DIALOG:
       return HandleFileManager(true /* as_dialog */);
     case OPEN_FILE_MANAGER_TAB:
       return HandleFileManager(false /* as_dialog */);
     case OPEN_CROSH:
       return HandleCrosh();
     case TOGGLE_SPOKEN_FEEDBACK:
       return HandleToggleSpokenFeedback();
     case CYCLE_DISPLAY_MODE:
-      ash::Shell::GetInstance()->output_configurator()->CycleDisplayMode();
+      ash::Shell::GetInstance()->output_configurator()->CycleDisplayMode(
+          internal::DisplayController::IsExtendedDesktopEnabled());
       return true;
 #endif
     case OPEN_FEEDBACK_PAGE:
       ash::Shell::GetInstance()->delegate()->OpenFeedbackPage();
       return true;
     case EXIT:
       return HandleExit();
     case NEW_INCOGNITO_WINDOW:
       return HandleNewWindow(true /* is_incognito */);
     case NEW_TAB:
@@ skipping 301 matching lines @@
     // Then set this one as active.
     Shell::GetInstance()->launcher()->ActivateLauncherItem(found_index);
   }
 }
 
 bool AcceleratorController::CanHandleAccelerators() const {
   return true;
 }
 
 }  // namespace ash