| 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 #ifndef COMPONENTS_MUS_WS_ACCELERATOR_H_ | 5 #ifndef SERVICES_UI_WS_ACCELERATOR_H_ |
| 6 #define COMPONENTS_MUS_WS_ACCELERATOR_H_ | 6 #define SERVICES_UI_WS_ACCELERATOR_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 #include "base/memory/weak_ptr.h" | 11 #include "base/memory/weak_ptr.h" |
| 12 #include "components/mus/public/interfaces/event_matcher.mojom.h" | 12 #include "services/ui/public/interfaces/event_matcher.mojom.h" |
| 13 #include "components/mus/ws/event_matcher.h" | 13 #include "services/ui/ws/event_matcher.h" |
| 14 | 14 |
| 15 namespace ui { | 15 namespace ui { |
| 16 class Event; | 16 class Event; |
| 17 } | 17 } |
| 18 | 18 |
| 19 namespace mus { | 19 namespace mus { |
| 20 namespace ws { | 20 namespace ws { |
| 21 | 21 |
| 22 // An Accelerator encompasses an id defined by the client, along with a unique | 22 // An Accelerator encompasses an id defined by the client, along with a unique |
| 23 // mojom::EventMatcher. See WindowManagerClient. | 23 // mojom::EventMatcher. See WindowManagerClient. |
| (...skipping 23 matching lines...) Expand all Loading... |
| 47 ui::mojom::AcceleratorPhase accelerator_phase_; | 47 ui::mojom::AcceleratorPhase accelerator_phase_; |
| 48 EventMatcher event_matcher_; | 48 EventMatcher event_matcher_; |
| 49 base::WeakPtrFactory<Accelerator> weak_factory_; | 49 base::WeakPtrFactory<Accelerator> weak_factory_; |
| 50 | 50 |
| 51 DISALLOW_COPY_AND_ASSIGN(Accelerator); | 51 DISALLOW_COPY_AND_ASSIGN(Accelerator); |
| 52 }; | 52 }; |
| 53 | 53 |
| 54 } // namespace ws | 54 } // namespace ws |
| 55 } // namespace mus | 55 } // namespace mus |
| 56 | 56 |
| 57 #endif // COMPONENTS_MUS_WS_ACCELERATOR_H_ | 57 #endif // SERVICES_UI_WS_ACCELERATOR_H_ |
| OLD | NEW |