| Index: components/arc/input/arc_input_bridge_impl.h
|
| diff --git a/components/arc/input/arc_input_bridge_impl.h b/components/arc/input/arc_input_bridge_impl.h
|
| index 0d6acb5edfa4cec5eb4321d2f77985c34386e381..d71fbde0c92ec76442669746bd2b40e24effe1e6 100644
|
| --- a/components/arc/input/arc_input_bridge_impl.h
|
| +++ b/components/arc/input/arc_input_bridge_impl.h
|
| @@ -2,12 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef COMPONENTS_ARC_INPUT_ARC_INPUT_BRIDGE_IMPL_H_
|
| -#define COMPONENTS_ARC_INPUT_ARC_INPUT_BRIDGE_IMPL_H_
|
| -
|
| -#include <stdint.h>
|
| -#include <string>
|
| -#include <vector>
|
| +#ifndef COMPONENTS_EXO_ARC_INPUT_ARC_INPUT_BRIDGE_IMPL_H_
|
| +#define COMPONENTS_EXO_ARC_INPUT_ARC_INPUT_BRIDGE_IMPL_H_
|
|
|
| #include "base/files/scoped_file.h"
|
| #include "base/macros.h"
|
| @@ -49,7 +45,7 @@
|
| void OnWindowInitialized(aura::Window* new_window) override;
|
|
|
| // Overridden from ArcBridgeService::Observer:
|
| - void OnInputInstanceReady() override;
|
| + void OnInstanceBootPhase(InstanceBootPhase phase) override;
|
|
|
| private:
|
| // Specialized method to translate and send events to the right file
|
| @@ -70,8 +66,8 @@
|
| // as in 0 (released), 1 (pressed) or 2 (repeated press).
|
| void SendKernelEvent(const base::ScopedFD& fd,
|
| base::TimeDelta timestamp,
|
| - uint16_t type,
|
| - uint16_t code,
|
| + unsigned short type,
|
| + unsigned short code,
|
| int value);
|
|
|
| // Shorthand for sending EV_SYN/SYN_REPORT
|
| @@ -84,7 +80,8 @@
|
| int FindTouchSlot(int tracking_id);
|
|
|
| // Maps DOM key codes to evdev key codes
|
| - uint16_t DomCodeToEvdevCode(ui::DomCode dom_code);
|
| + unsigned short DomCodeToEvdevCode(ui::DomCode dom_code);
|
| +
|
|
|
| // Setup bridge devices on the instance side. This needs to be called after
|
| // the InstanceBootPhase::SYSTEM_SERVICES_READY has been reached.
|
| @@ -133,4 +130,4 @@
|
|
|
| } // namespace arc
|
|
|
| -#endif // COMPONENTS_ARC_INPUT_ARC_INPUT_BRIDGE_IMPL_H_
|
| +#endif // COMPONENTS_EXO_ARC_INPUT_ARC_INPUT_BRIDGE_IMPL_H_
|
|
|