| 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 "ash/mus/window_manager.h" | 7 #include "ash/mus/window_manager.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "mash/public/interfaces/launchable.mojom.h" | 9 #include "mash/public/interfaces/launchable.mojom.h" |
| 10 #include "services/service_manager/public/cpp/connector.h" | 10 #include "services/service_manager/public/cpp/connector.h" |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 window_manager_->connector()->BindInterface("touch_hud", &launchable); | 138 window_manager_->connector()->BindInterface("touch_hud", &launchable); |
| 139 launchable->Launch(mash::mojom::kWindow, | 139 launchable->Launch(mash::mojom::kWindow, |
| 140 mash::mojom::LaunchMode::DEFAULT); | 140 mash::mojom::LaunchMode::DEFAULT); |
| 141 break; | 141 break; |
| 142 } | 142 } |
| 143 default: | 143 default: |
| 144 NOTREACHED(); | 144 NOTREACHED(); |
| 145 } | 145 } |
| 146 } | 146 } |
| 147 | 147 |
| 148 void AcceleratorControllerDelegateMus::ShowDeprecatedAcceleratorNotification( | |
| 149 const char* const notification_id, | |
| 150 int message_id, | |
| 151 int old_shortcut_id, | |
| 152 int new_shortcut_id) { | |
| 153 // TODO: http://crbug.com/630316. | |
| 154 NOTIMPLEMENTED(); | |
| 155 } | |
| 156 | |
| 157 } // namespace mus | 148 } // namespace mus |
| 158 } // namespace ash | 149 } // namespace ash |
| OLD | NEW |