| Index: services/ui/input_devices/input_device_server.h
|
| diff --git a/services/ui/input_devices/input_device_server.h b/services/ui/input_devices/input_device_server.h
|
| index f35bd588e9d109e57a96669a5c6cd5ca378fbe17..a84651deafa8a5a5b35da7b5dfaf14a898c77b1f 100644
|
| --- a/services/ui/input_devices/input_device_server.h
|
| +++ b/services/ui/input_devices/input_device_server.h
|
| @@ -14,7 +14,7 @@
|
| #include "ui/events/devices/device_data_manager.h"
|
| #include "ui/events/devices/input_device_event_observer.h"
|
|
|
| -namespace shell {
|
| +namespace service_manager {
|
| class InterfaceRegistry;
|
| }
|
|
|
| @@ -24,7 +24,7 @@ namespace ui {
|
| // updates to any registered InputDeviceObserverMojo in other processes via
|
| // Mojo IPC. This runs in the mus-ws process.
|
| class InputDeviceServer
|
| - : public shell::InterfaceFactory<mojom::InputDeviceServer>,
|
| + : public service_manager::InterfaceFactory<mojom::InputDeviceServer>,
|
| public mojom::InputDeviceServer,
|
| public ui::InputDeviceEventObserver {
|
| public:
|
| @@ -39,7 +39,7 @@ class InputDeviceServer
|
| // connect. You should have already called RegisterAsObserver() to get local
|
| // input-device event updates and checked it was successful by calling
|
| // IsRegisteredAsObserver().
|
| - void AddInterface(shell::InterfaceRegistry* registry);
|
| + void AddInterface(service_manager::InterfaceRegistry* registry);
|
|
|
| // mojom::InputDeviceServer:
|
| void AddObserver(mojom::InputDeviceObserverMojoPtr observer) override;
|
| @@ -57,7 +57,7 @@ class InputDeviceServer
|
| void SendDeviceListsComplete(mojom::InputDeviceObserverMojo* observer);
|
|
|
| // mojo::InterfaceFactory<mojom::InputDeviceServer>:
|
| - void Create(const shell::Identity& remote_identity,
|
| + void Create(const service_manager::Identity& remote_identity,
|
| mojom::InputDeviceServerRequest request) override;
|
|
|
| mojo::BindingSet<mojom::InputDeviceServer> bindings_;
|
|
|