Handle modified displays in mustash.

ash/mus/accelerators/accelerator_controller_delegate_mus.cc

 // Copyright 2016 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/mus/accelerators/accelerator_controller_delegate_mus.h"
 
+#include "ash/mus/window_manager.h"
 #include "base/logging.h"
 #include "mash/public/interfaces/launchable.mojom.h"
+#include "services/service_manager/public/cpp/connector.h"
 #include "services/ui/public/interfaces/display/display_controller.mojom.h"
 #include "services/ui/public/interfaces/display/test_display_controller.mojom.h"
 
 namespace ash {
 namespace mus {
 
 AcceleratorControllerDelegateMus::AcceleratorControllerDelegateMus(
-    service_manager::Connector* connector)
-    : connector_(connector) {
+    WindowManager* window_manager)
+    : window_manager_(window_manager) {
 #if !defined(OS_CHROMEOS)
-  // To avoid trybot complaining that |connector_| is not being
-  // used in non-ChromeOS.
-  connector_ = nullptr;
+  // To avoid trybot complaining that |window_manager_| is not being used in
+  // non-ChromeOS.
+  window_manager_ = nullptr;
 #endif
 }
 
 AcceleratorControllerDelegateMus::~AcceleratorControllerDelegateMus() {}
 
 bool AcceleratorControllerDelegateMus::HandlesAction(AcceleratorAction action) {
   // This is the list of actions that are not ported from aura. The actions are
   // replicated here to make sure we don't forget any. This list should
   // eventually be empty. If there are any actions that don't make sense for
   // mus, then they should be removed from AcceleratorAction.
@@ skipping 14 matching lines @@
     case SHOW_SYSTEM_TRAY_BUBBLE:
     case TAKE_PARTIAL_SCREENSHOT:
     case TAKE_SCREENSHOT:
     case TAKE_WINDOW_SCREENSHOT:
     case UNPIN:
       NOTIMPLEMENTED();
       return false;
 
 #if defined(OS_CHROMEOS)
     case DEV_ADD_REMOVE_DISPLAY:
+    case DEV_TOGGLE_UNIFIED_DESKTOP:
     case SWAP_PRIMARY_DISPLAY:
     case TOUCH_HUD_PROJECTION_TOGGLE:
       return true;
-    case DEV_TOGGLE_UNIFIED_DESKTOP:
     case LOCK_PRESSED:
     case LOCK_RELEASED:
     case POWER_PRESSED:
     case POWER_RELEASED:
     case TOGGLE_MIRROR_MODE:
     case TOUCH_HUD_CLEAR:
     case TOUCH_HUD_MODE_CHANGE:
       NOTIMPLEMENTED();
       return false;
 #endif
 
     default:
       break;
   }
   return false;
 }
 
 bool AcceleratorControllerDelegateMus::CanPerformAction(
     AcceleratorAction action,
     const ui::Accelerator& accelerator,
     const ui::Accelerator& previous_accelerator) {
 #if defined(OS_CHROMEOS)
   switch (action) {
     case DEV_ADD_REMOVE_DISPLAY:
+    case DEV_TOGGLE_UNIFIED_DESKTOP:
     case SWAP_PRIMARY_DISPLAY:
     case TOUCH_HUD_PROJECTION_TOGGLE:
       return true;
     default:
       break;
   }
 #endif
   return false;
 }
 
 void AcceleratorControllerDelegateMus::PerformAction(
     AcceleratorAction action,
     const ui::Accelerator& accelerator) {
 #if defined(OS_CHROMEOS)
   switch (action) {
     case DEV_ADD_REMOVE_DISPLAY: {
       display::mojom::TestDisplayControllerPtr test_display_controller;
-      connector_->ConnectToInterface("service:ui", &test_display_controller);
+      window_manager_->connector()->ConnectToInterface(
+          "service:ui", &test_display_controller);
       test_display_controller->ToggleAddRemoveDisplay();
       break;
     }
+    case DEV_TOGGLE_UNIFIED_DESKTOP: {
+      // TODO(crbug.com/657816): This is hack. I'm just stealing the shortcut
+      // key to toggle display size in mus. This should be removed by launch.
+      display::mojom::TestDisplayControllerPtr test_display_controller;
+      window_manager_->connector()->ConnectToInterface(
+          "service:ui", &test_display_controller);
+      test_display_controller->ToggleDisplayResolution();
+      break;
+    }
     case SWAP_PRIMARY_DISPLAY: {
-      display::mojom::DisplayControllerPtr display_controller;
-      connector_->ConnectToInterface("service:ui", &display_controller);
-      display_controller->SwapPrimaryDisplay();
+      window_manager_->GetDisplayController()->SwapPrimaryDisplay();
       break;
     }
     case TOUCH_HUD_PROJECTION_TOGGLE: {
       mash::mojom::LaunchablePtr launchable;
-      connector_->ConnectToInterface("service:touch_hud", &launchable);
+      window_manager_->connector()->ConnectToInterface("service:touch_hud",
+                                                       &launchable);
       launchable->Launch(mash::mojom::kWindow,
                          mash::mojom::LaunchMode::DEFAULT);
       break;
     }
     default:
       NOTREACHED();
   }
 #else
   NOTREACHED();
 #endif
 }
 
 void AcceleratorControllerDelegateMus::ShowDeprecatedAcceleratorNotification(
     const char* const notification_id,
     int message_id,
     int old_shortcut_id,
     int new_shortcut_id) {
   // TODO: http://crbug.com/630316.
   NOTIMPLEMENTED();
 }
 
 }  // namespace mus
 }  // namespace ash