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 #include "services/ui/public/interfaces/display/display_controller.mojom.h" |
10 | 10 |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 case TAKE_PARTIAL_SCREENSHOT: | 46 case TAKE_PARTIAL_SCREENSHOT: |
47 case TAKE_SCREENSHOT: | 47 case TAKE_SCREENSHOT: |
48 case TAKE_WINDOW_SCREENSHOT: | 48 case TAKE_WINDOW_SCREENSHOT: |
49 case UNPIN: | 49 case UNPIN: |
50 NOTIMPLEMENTED(); | 50 NOTIMPLEMENTED(); |
51 return false; | 51 return false; |
52 | 52 |
53 #if defined(OS_CHROMEOS) | 53 #if defined(OS_CHROMEOS) |
54 case DEV_ADD_REMOVE_DISPLAY: { | 54 case DEV_ADD_REMOVE_DISPLAY: { |
55 display::mojom::DisplayControllerPtr display_controller; | 55 display::mojom::DisplayControllerPtr display_controller; |
56 connector_->ConnectToInterface("mojo:ui", &display_controller); | 56 connector_->ConnectToInterface("service:ui", &display_controller); |
57 display_controller->ToggleVirtualDisplay(); | 57 display_controller->ToggleVirtualDisplay(); |
58 return true; | 58 return true; |
59 } | 59 } |
60 case DEV_TOGGLE_UNIFIED_DESKTOP: | 60 case DEV_TOGGLE_UNIFIED_DESKTOP: |
61 case DISABLE_GPU_WATCHDOG: | 61 case DISABLE_GPU_WATCHDOG: |
62 case LOCK_PRESSED: | 62 case LOCK_PRESSED: |
63 case LOCK_RELEASED: | 63 case LOCK_RELEASED: |
64 case POWER_PRESSED: | 64 case POWER_PRESSED: |
65 case POWER_RELEASED: | 65 case POWER_RELEASED: |
66 case SWAP_PRIMARY_DISPLAY: | 66 case SWAP_PRIMARY_DISPLAY: |
67 case TOGGLE_MIRROR_MODE: | 67 case TOGGLE_MIRROR_MODE: |
68 case TOUCH_HUD_CLEAR: | 68 case TOUCH_HUD_CLEAR: |
69 case TOUCH_HUD_MODE_CHANGE: | 69 case TOUCH_HUD_MODE_CHANGE: |
70 NOTIMPLEMENTED(); | 70 NOTIMPLEMENTED(); |
71 return false; | 71 return false; |
72 case TOUCH_HUD_PROJECTION_TOGGLE: { | 72 case TOUCH_HUD_PROJECTION_TOGGLE: { |
73 mash::mojom::LaunchablePtr launchable; | 73 mash::mojom::LaunchablePtr launchable; |
74 connector_->ConnectToInterface("mojo:touch_hud", &launchable); | 74 connector_->ConnectToInterface("service:touch_hud", &launchable); |
75 launchable->Launch(mash::mojom::kWindow, | 75 launchable->Launch(mash::mojom::kWindow, |
76 mash::mojom::LaunchMode::DEFAULT); | 76 mash::mojom::LaunchMode::DEFAULT); |
77 return true; | 77 return true; |
78 } | 78 } |
79 #endif | 79 #endif |
80 | 80 |
81 default: | 81 default: |
82 break; | 82 break; |
83 } | 83 } |
84 return false; | 84 return false; |
(...skipping 17 matching lines...) Expand all Loading... |
102 const char* const notification_id, | 102 const char* const notification_id, |
103 int message_id, | 103 int message_id, |
104 int old_shortcut_id, | 104 int old_shortcut_id, |
105 int new_shortcut_id) { | 105 int new_shortcut_id) { |
106 // TODO: http://crbug.com/630316. | 106 // TODO: http://crbug.com/630316. |
107 NOTIMPLEMENTED(); | 107 NOTIMPLEMENTED(); |
108 } | 108 } |
109 | 109 |
110 } // namespace mus | 110 } // namespace mus |
111 } // namespace ash | 111 } // namespace ash |
OLD | NEW |