Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(234)

Unified Diff: components/arc/input/arc_input_bridge_impl.h

Issue 1523643002: arc-bridge: Move most methods to Mojo interfaces (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@master
Patch Set: Added explicit ordinals and fixed a potential race Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 d71fbde0c92ec76442669746bd2b40e24effe1e6..67992741b594dba1b2f1a9897929c60d482e442e 100644
--- a/components/arc/input/arc_input_bridge_impl.h
+++ b/components/arc/input/arc_input_bridge_impl.h
@@ -2,8 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef COMPONENTS_EXO_ARC_INPUT_ARC_INPUT_BRIDGE_IMPL_H_
-#define COMPONENTS_EXO_ARC_INPUT_ARC_INPUT_BRIDGE_IMPL_H_
+#ifndef COMPONENTS_ARC_INPUT_ARC_INPUT_BRIDGE_IMPL_H_
+#define COMPONENTS_ARC_INPUT_ARC_INPUT_BRIDGE_IMPL_H_
+
+#include <string>
+#include <vector>
#include "base/files/scoped_file.h"
#include "base/macros.h"
@@ -45,7 +48,7 @@ class ArcInputBridgeImpl : public ArcInputBridge,
void OnWindowInitialized(aura::Window* new_window) override;
// Overridden from ArcBridgeService::Observer:
- void OnInstanceBootPhase(InstanceBootPhase phase) override;
+ void OnInputInstanceReady() override;
private:
// Specialized method to translate and send events to the right file
@@ -66,8 +69,8 @@ class ArcInputBridgeImpl : public ArcInputBridge,
// as in 0 (released), 1 (pressed) or 2 (repeated press).
void SendKernelEvent(const base::ScopedFD& fd,
base::TimeDelta timestamp,
- unsigned short type,
- unsigned short code,
+ uint16_t type,
dcheng 2015/12/16 06:26:16 Nit: stdint.h for these types
Luis Héctor Chávez 2015/12/16 17:07:22 Done.
+ uint16_t code,
int value);
// Shorthand for sending EV_SYN/SYN_REPORT
@@ -80,8 +83,7 @@ class ArcInputBridgeImpl : public ArcInputBridge,
int FindTouchSlot(int tracking_id);
// Maps DOM key codes to evdev key codes
- unsigned short DomCodeToEvdevCode(ui::DomCode dom_code);
-
+ uint16_t 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.
@@ -130,4 +132,4 @@ class ArcInputBridgeImpl : public ArcInputBridge,
} // namespace arc
-#endif // COMPONENTS_EXO_ARC_INPUT_ARC_INPUT_BRIDGE_IMPL_H_
+#endif // COMPONENTS_ARC_INPUT_ARC_INPUT_BRIDGE_IMPL_H_

Powered by Google App Engine
This is Rietveld 408576698