Revert of Reland "arc-bridge: Move most methods to Mojo interfaces"

components/arc/input/arc_input_bridge_impl.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // 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"
 #include "components/arc/input/arc_input_bridge.h"
 #include "ui/aura/env.h"
 #include "ui/aura/env_observer.h"
 #include "ui/aura/window_tracker.h"
 #include "ui/events/event.h"
 #include "ui/events/event_handler.h"
 
@@ skipping 21 matching lines @@
   explicit ArcInputBridgeImpl(ArcBridgeService* arc_bridge_service);
   ~ArcInputBridgeImpl() override;
 
   // Overridden from ui::EventHandler:
   void OnEvent(ui::Event* event) override;
 
   // Overridden from aura::EnvObserver:
   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
   // descriptor.
   void SendKeyEvent(ui::KeyEvent* event);
   void SendTouchEvent(ui::TouchEvent* event);
   void SendMouseEvent(ui::MouseEvent* event);
 
   // Helper method to send a struct input_event to the file descriptor. This
   // method is to be called on the ui thread and will post a request to send
   // the event to the io thread.
   // The parameters map directly to the members of input_event as
   // defined by the evdev protocol.
   // |type| is the type of event to sent, such as EV_SYN, EV_KEY, EV_ABS.
   // |code| is either interpreted as axis (ABS_X, ABS_Y, ...) or as key-code
   //        (KEY_A, KEY_B, ...).
   // |value| is either the value of that axis or the boolean value of the key
   //         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
   void SendSynReport(const base::ScopedFD& fd, base::TimeDelta timestamp);
 
   // Return existing or new slot for this event.
   int AcquireTouchSlot(ui::TouchEvent* event);
 
   // Return touch slot for tracking id.
   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.
   void SetupBridgeDevices();
 
   // Creates and registers file descriptor pair with the ARC bridge service,
   // the write end is returned while the read end is sent through the bridge
   // to the ARC instance.
   // TODO(denniskempin): Make this interface more typesafe.
   // |name| should be the displayable name of the emulated device (e.g. "Chrome
@@ skipping 28 matching lines @@
   aura::WindowTracker arc_windows_;
 
   // WeakPtrFactory to use for callbacks.
   base::WeakPtrFactory<ArcInputBridgeImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcInputBridgeImpl);
 };
 
 }  // namespace arc
 
-#endif  // COMPONENTS_ARC_INPUT_ARC_INPUT_BRIDGE_IMPL_H_
+#endif  // COMPONENTS_EXO_ARC_INPUT_ARC_INPUT_BRIDGE_IMPL_H_