Introduce DisplayConfigurationController

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>
 #include <utility>
 
 #include "ash/accelerators/accelerator_commands.h"
 #include "ash/accelerators/debug_commands.h"
 #include "ash/ash_switches.h"
 #include "ash/debug.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/focus_cycler.h"
 #include "ash/gpu_support.h"
 #include "ash/ime_control_delegate.h"
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/magnifier/partial_magnification_controller.h"
 #include "ash/media_delegate.h"
 #include "ash/multi_profile_uma.h"
 #include "ash/new_window_delegate.h"
 #include "ash/root_window_controller.h"
 #include "ash/rotator/screen_rotation_animator.h"
 #include "ash/rotator/window_rotation.h"
+#include "ash/screen_util.h"
 #include "ash/screenshot_delegate.h"
 #include "ash/session/session_state_delegate.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_delegate.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/brightness_control_delegate.h"
@@ skipping 30 matching lines @@
 #include "ui/compositor/layer_animator.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/screen.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notifier_settings.h"
 #include "ui/views/controls/webview/webview.h"
 
 #if defined(OS_CHROMEOS)
+#include "ash/display/display_configuration_controller.h"
 #include "ash/system/chromeos/keyboard_brightness_controller.h"
 #include "base/sys_info.h"
 #include "ui/base/ime/chromeos/ime_keyboard.h"
 #include "ui/base/ime/chromeos/input_method_manager.h"
 #endif  // defined(OS_CHROMEOS)
 
 namespace ash {
 namespace {
 
 using base::UserMetricsAction;
@@ skipping 540 matching lines @@
   return delegate->IsSpokenFeedbackEnabled();
 }
 
 void HandleSilenceSpokenFeedback() {
   base::RecordAction(UserMetricsAction("Accel_Silence_Spoken_Feedback"));
   Shell::GetInstance()->accessibility_delegate()->SilenceSpokenFeedback();
 }
 
 void HandleSwapPrimaryDisplay() {
   base::RecordAction(UserMetricsAction("Accel_Swap_Primary_Display"));
+#if defined(OS_CHROMEOS)

[oshima, 2016/01/19 18:49:16]

I think you don't have to worry about other platforms as long as tests/bots
passes.

[stevenjb, 2016/01/19 20:32:04]

Currently display_configuration_controller() only exists on Chrome OS (because
display_configurator only exists on Chrome OS), so until / unless we clean all
of that up, this is needed.

[oshima, 2016/01/19 20:59:30]

ack. hopefully we can remove ifdef soon.

[stevenjb, 2016/01/20 01:25:36]

Actually, I went ahead and fixed this.

+  DisplayManager* display_manager = Shell::GetInstance()->display_manager();
+  if (display_manager->GetNumDisplays() < 2)
+    return;
+  Shell::GetInstance()->display_configuration_controller()->SetPrimaryDisplayId(
+      ScreenUtil::GetSecondaryDisplay().id(), true /* user_action */);
+#else
+  // On non Chrome OS platforms this will swap the display immediately with
+  // no animation or frequencey limiter.
   Shell::GetInstance()->window_tree_host_manager()->SwapPrimaryDisplay();
+#endif
 }
 
 bool CanHandleCycleUser() {
   Shell* shell = Shell::GetInstance();
   return shell->delegate()->IsMultiProfilesEnabled() &&
       shell->session_state_delegate()->NumberOfLoggedInUsers() > 1;
 }
 
 void HandleCycleUser(SessionStateDelegate::CycleUser cycle_user) {
   MultiProfileUMA::RecordSwitchActiveUser(
@@ skipping 28 matching lines @@
 void HandleToggleCapsLock() {
   base::RecordAction(UserMetricsAction("Accel_Toggle_Caps_Lock"));
   chromeos::input_method::InputMethodManager* ime =
       chromeos::input_method::InputMethodManager::Get();
   chromeos::input_method::ImeKeyboard* keyboard = ime->GetImeKeyboard();
   keyboard->SetCapsLockEnabled(!keyboard->CapsLockIsEnabled());
 }
 
 void HandleToggleMirrorMode() {
   base::RecordAction(UserMetricsAction("Accel_Toggle_Mirror_Mode"));
+  bool mirror = !Shell::GetInstance()->display_manager()->IsInMirrorMode();
+#if defined(OS_CHROMEOS)
+  Shell::GetInstance()->display_configuration_controller()->SetMirrorMode(
+      mirror, true /* user_action */);
+#else
+  // On non Chrome OS platforms this toggle mirror mode immediately with
+  // no animation or frequencey limiter.
   Shell::GetInstance()->window_tree_host_manager()->ToggleMirrorMode();
+#endif
 }
 
 void HandleToggleSpokenFeedback() {
   base::RecordAction(UserMetricsAction("Accel_Toggle_Spoken_Feedback"));
 
   Shell::GetInstance()->accessibility_delegate()->
       ToggleSpokenFeedback(ui::A11Y_NOTIFICATION_SHOW);
 }
 
 bool CanHandleToggleTouchViewTesting() {
@@ skipping 755 matching lines @@
 }
 
 void AcceleratorController::SetKeyboardBrightnessControlDelegate(
     scoped_ptr<KeyboardBrightnessControlDelegate>
     keyboard_brightness_control_delegate) {
   keyboard_brightness_control_delegate_ =
       std::move(keyboard_brightness_control_delegate);
 }
 
 }  // namespace ash