| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 <stdint.h> | 5 #include <stdint.h> |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 #include "base/run_loop.h" | 11 #include "base/run_loop.h" |
| 12 #include "components/mus/common/event_matcher_util.h" | |
| 13 #include "components/mus/public/cpp/window.h" | |
| 14 #include "components/mus/public/interfaces/accelerator_registrar.mojom.h" | |
| 15 #include "mojo/public/cpp/bindings/binding.h" | 12 #include "mojo/public/cpp/bindings/binding.h" |
| 16 #include "services/shell/public/cpp/shell_test.h" | 13 #include "services/shell/public/cpp/shell_test.h" |
| 14 #include "services/ui/common/event_matcher_util.h" |
| 15 #include "services/ui/public/cpp/window.h" |
| 16 #include "services/ui/public/interfaces/accelerator_registrar.mojom.h" |
| 17 | 17 |
| 18 using ::mus::mojom::AcceleratorHandler; | 18 using ::mus::mojom::AcceleratorHandler; |
| 19 using ::mus::mojom::AcceleratorHandlerPtr; | 19 using ::mus::mojom::AcceleratorHandlerPtr; |
| 20 using ::mus::mojom::AcceleratorRegistrar; | 20 using ::mus::mojom::AcceleratorRegistrar; |
| 21 using ::mus::mojom::AcceleratorRegistrarPtr; | 21 using ::mus::mojom::AcceleratorRegistrarPtr; |
| 22 | 22 |
| 23 namespace ash { | 23 namespace ash { |
| 24 namespace mus { | 24 namespace mus { |
| 25 | 25 |
| 26 class TestAcceleratorHandler : public AcceleratorHandler { | 26 class TestAcceleratorHandler : public AcceleratorHandler { |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 EXPECT_FALSE(handler_first.AttemptToInstallAccelerator( | 107 EXPECT_FALSE(handler_first.AttemptToInstallAccelerator( |
| 108 3, ::mus::CreateKeyMatcher(ui::mojom::KeyboardCode::N, | 108 3, ::mus::CreateKeyMatcher(ui::mojom::KeyboardCode::N, |
| 109 ui::mojom::kEventFlagShiftDown))); | 109 ui::mojom::kEventFlagShiftDown))); |
| 110 EXPECT_FALSE(handler_second.AttemptToInstallAccelerator( | 110 EXPECT_FALSE(handler_second.AttemptToInstallAccelerator( |
| 111 3, ::mus::CreateKeyMatcher(ui::mojom::KeyboardCode::N, | 111 3, ::mus::CreateKeyMatcher(ui::mojom::KeyboardCode::N, |
| 112 ui::mojom::kEventFlagShiftDown))); | 112 ui::mojom::kEventFlagShiftDown))); |
| 113 } | 113 } |
| 114 | 114 |
| 115 } // namespace mus | 115 } // namespace mus |
| 116 } // namespace ash | 116 } // namespace ash |
| OLD | NEW |