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 "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
10 #include "components/mus/public/cpp/event_matcher.h" | 10 #include "components/mus/public/cpp/event_matcher.h" |
11 #include "components/mus/public/cpp/window.h" | 11 #include "components/mus/public/cpp/window.h" |
12 #include "components/mus/public/interfaces/accelerator_registrar.mojom.h" | 12 #include "components/mus/public/interfaces/accelerator_registrar.mojom.h" |
13 #include "components/mus/public/interfaces/window_manager.mojom.h" | 13 #include "components/mus/public/interfaces/window_manager.mojom.h" |
14 #include "mojo/application/public/cpp/application_impl.h" | |
15 #include "mojo/application/public/cpp/application_test_base.h" | |
16 #include "mojo/public/cpp/bindings/binding.h" | 14 #include "mojo/public/cpp/bindings/binding.h" |
| 15 #include "mojo/shell/public/cpp/application_impl.h" |
| 16 #include "mojo/shell/public/cpp/application_test_base.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 mash { | 23 namespace mash { |
24 namespace wm { | 24 namespace wm { |
25 | 25 |
26 class TestAcceleratorHandler : public AcceleratorHandler { | 26 class TestAcceleratorHandler : public AcceleratorHandler { |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
109 EXPECT_FALSE(handler_first.AttemptToInstallAccelerator( | 109 EXPECT_FALSE(handler_first.AttemptToInstallAccelerator( |
110 3, mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_N, | 110 3, mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_N, |
111 mus::mojom::EVENT_FLAGS_SHIFT_DOWN))); | 111 mus::mojom::EVENT_FLAGS_SHIFT_DOWN))); |
112 EXPECT_FALSE(handler_second.AttemptToInstallAccelerator( | 112 EXPECT_FALSE(handler_second.AttemptToInstallAccelerator( |
113 3, mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_N, | 113 3, mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_N, |
114 mus::mojom::EVENT_FLAGS_SHIFT_DOWN))); | 114 mus::mojom::EVENT_FLAGS_SHIFT_DOWN))); |
115 } | 115 } |
116 | 116 |
117 } // namespace wm | 117 } // namespace wm |
118 } // namespace mash | 118 } // namespace mash |
OLD | NEW |