| 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 ASH_MUS_KEYBOARD_UI_MUS_H_ | 5 #ifndef ASH_MUS_KEYBOARD_UI_MUS_H_ |
| 6 #define ASH_MUS_KEYBOARD_UI_MUS_H_ | 6 #define ASH_MUS_KEYBOARD_UI_MUS_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| 11 | 11 |
| 12 #include "ash/common/keyboard/keyboard_ui.h" | 12 #include "ash/keyboard/keyboard_ui.h" |
| 13 #include "base/macros.h" | 13 #include "base/macros.h" |
| 14 #include "mojo/public/cpp/bindings/binding.h" | 14 #include "mojo/public/cpp/bindings/binding.h" |
| 15 #include "ui/keyboard/keyboard.mojom.h" | 15 #include "ui/keyboard/keyboard.mojom.h" |
| 16 | 16 |
| 17 namespace service_manager { | 17 namespace service_manager { |
| 18 class Connector; | 18 class Connector; |
| 19 } | 19 } |
| 20 | 20 |
| 21 namespace ash { | 21 namespace ash { |
| 22 | 22 |
| (...skipping 25 matching lines...) Expand all Loading... |
| 48 // May be null during tests. | 48 // May be null during tests. |
| 49 keyboard::mojom::KeyboardPtr keyboard_; | 49 keyboard::mojom::KeyboardPtr keyboard_; |
| 50 mojo::Binding<keyboard::mojom::KeyboardObserver> observer_binding_; | 50 mojo::Binding<keyboard::mojom::KeyboardObserver> observer_binding_; |
| 51 | 51 |
| 52 DISALLOW_COPY_AND_ASSIGN(KeyboardUIMus); | 52 DISALLOW_COPY_AND_ASSIGN(KeyboardUIMus); |
| 53 }; | 53 }; |
| 54 | 54 |
| 55 } // namespace ash | 55 } // namespace ash |
| 56 | 56 |
| 57 #endif // ASH_MUS_KEYBOARD_UI_MUS_H_ | 57 #endif // ASH_MUS_KEYBOARD_UI_MUS_H_ |
| OLD | NEW |