OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ash/mus/accelerators/accelerator_controller_delegate_mus.h" | 5 #include "ash/mus/accelerators/accelerator_controller_delegate_mus.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "mash/public/interfaces/launchable.mojom.h" | 8 #include "mash/public/interfaces/launchable.mojom.h" |
| 9 #include "services/ui/public/interfaces/display/display_controller.mojom.h" |
9 | 10 |
10 namespace ash { | 11 namespace ash { |
11 namespace mus { | 12 namespace mus { |
12 | 13 |
13 AcceleratorControllerDelegateMus::AcceleratorControllerDelegateMus( | 14 AcceleratorControllerDelegateMus::AcceleratorControllerDelegateMus( |
14 shell::Connector* connector) | 15 shell::Connector* connector) |
15 : connector_(connector) { | 16 : connector_(connector) { |
16 #if !defined(OS_CHROMEOS) | 17 #if !defined(OS_CHROMEOS) |
17 // To avoid trybot complaining that |connector_| is not being | 18 // To avoid trybot complaining that |connector_| is not being |
18 // used in non-ChromeOS. | 19 // used in non-ChromeOS. |
(...skipping 24 matching lines...) Expand all Loading... |
43 case SCALE_UI_UP: | 44 case SCALE_UI_UP: |
44 case SHOW_SYSTEM_TRAY_BUBBLE: | 45 case SHOW_SYSTEM_TRAY_BUBBLE: |
45 case TAKE_PARTIAL_SCREENSHOT: | 46 case TAKE_PARTIAL_SCREENSHOT: |
46 case TAKE_SCREENSHOT: | 47 case TAKE_SCREENSHOT: |
47 case TAKE_WINDOW_SCREENSHOT: | 48 case TAKE_WINDOW_SCREENSHOT: |
48 case UNPIN: | 49 case UNPIN: |
49 NOTIMPLEMENTED(); | 50 NOTIMPLEMENTED(); |
50 return false; | 51 return false; |
51 | 52 |
52 #if defined(OS_CHROMEOS) | 53 #if defined(OS_CHROMEOS) |
53 case DEBUG_ADD_REMOVE_DISPLAY: | 54 case DEBUG_ADD_REMOVE_DISPLAY: { |
| 55 display::mojom::DisplayControllerPtr display_controller; |
| 56 connector_->ConnectToInterface("mojo:ui", &display_controller); |
| 57 display_controller->ToggleVirtualDisplay(); |
| 58 break; |
| 59 } |
54 case DEBUG_TOGGLE_UNIFIED_DESKTOP: | 60 case DEBUG_TOGGLE_UNIFIED_DESKTOP: |
55 case DISABLE_GPU_WATCHDOG: | 61 case DISABLE_GPU_WATCHDOG: |
56 case LOCK_PRESSED: | 62 case LOCK_PRESSED: |
57 case LOCK_RELEASED: | 63 case LOCK_RELEASED: |
58 case POWER_PRESSED: | 64 case POWER_PRESSED: |
59 case POWER_RELEASED: | 65 case POWER_RELEASED: |
60 case SWAP_PRIMARY_DISPLAY: | 66 case SWAP_PRIMARY_DISPLAY: |
61 case TOGGLE_MIRROR_MODE: | 67 case TOGGLE_MIRROR_MODE: |
62 case TOUCH_HUD_CLEAR: | 68 case TOUCH_HUD_CLEAR: |
63 case TOUCH_HUD_MODE_CHANGE: | 69 case TOUCH_HUD_MODE_CHANGE: |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
96 const char* const notification_id, | 102 const char* const notification_id, |
97 int message_id, | 103 int message_id, |
98 int old_shortcut_id, | 104 int old_shortcut_id, |
99 int new_shortcut_id) { | 105 int new_shortcut_id) { |
100 // TODO: http://crbug.com/630316. | 106 // TODO: http://crbug.com/630316. |
101 NOTIMPLEMENTED(); | 107 NOTIMPLEMENTED(); |
102 } | 108 } |
103 | 109 |
104 } // namespace mus | 110 } // namespace mus |
105 } // namespace ash | 111 } // namespace ash |
OLD | NEW |