Convert Aura to use ui::Event.

ui/aura/event.h

Index: ui/aura/event.h
===================================================================
--- ui/aura/event.h	(revision 150582)
+++ ui/aura/event.h	(working copy)
@@ -1,400 +0,0 @@
-// Copyright (c) 2012 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 UI_AURA_EVENT_H_
-#define UI_AURA_EVENT_H_
-
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
-#include "base/event_types.h"
-#include "base/logging.h"
-#include "base/time.h"
-#include "ui/aura/aura_export.h"
-#include "ui/base/dragdrop/os_exchange_data.h"
-#include "ui/base/events.h"
-#include "ui/base/gestures/gesture_types.h"
-#include "ui/base/keycodes/keyboard_codes.h"
-#include "ui/gfx/point.h"
-
-namespace ui {
-class Transform;
-}
-
-namespace aura {
-
-class Window;
-
-class AURA_EXPORT Event {
- public:
-  virtual ~Event();
-
-  // For testing.
-  class TestApi {
-   public:
-    explicit TestApi(Event* event) : event_(event) {}
-
-    void set_time_stamp(const base::TimeDelta& time_stamp) {
-      event_->time_stamp_ = time_stamp;
-    }
-
-   private:
-    TestApi();
-    Event* event_;
-  };
-
-  const base::NativeEvent& native_event() const { return native_event_; }
-  ui::EventType type() const { return type_; }
-  // time_stamp represents time since machine was booted.
-  const base::TimeDelta& time_stamp() const { return time_stamp_; }
-  int flags() const { return flags_; }
-
-  // This is only intended to be used externally by classes that are modifying
-  // events in EventFilter::PreHandleKeyEvent().
-  void set_flags(int flags) { flags_ = flags; }
-
-  // The following methods return true if the respective keys were pressed at
-  // the time the event was created.
-  bool IsShiftDown() const { return (flags_ & ui::EF_SHIFT_DOWN) != 0; }
-  bool IsControlDown() const { return (flags_ & ui::EF_CONTROL_DOWN) != 0; }
-  bool IsCapsLockDown() const { return (flags_ & ui::EF_CAPS_LOCK_DOWN) != 0; }
-  bool IsAltDown() const { return (flags_ & ui::EF_ALT_DOWN) != 0; }
-
-  // Returns true if the event has a valid |native_event_|.
-  bool HasNativeEvent() const;
-
- protected:
-  Event(ui::EventType type, int flags);
-  Event(const base::NativeEvent& native_event, ui::EventType type, int flags);
-  Event(const Event& copy);
-  void set_type(ui::EventType type) { type_ = type; }
-  void set_delete_native_event(bool delete_native_event) {
-    delete_native_event_ = delete_native_event;
-  }
-  void set_time_stamp(base::TimeDelta time_stamp) { time_stamp_ = time_stamp; }
-
- private:
-  void operator=(const Event&);
-
-  // Safely initializes the native event members of this class.
-  void Init();
-  void InitWithNativeEvent(const base::NativeEvent& native_event);
-
-  base::NativeEvent native_event_;
-  ui::EventType type_;
-  base::TimeDelta time_stamp_;
-  int flags_;
-  bool delete_native_event_;
-};
-
-class AURA_EXPORT LocatedEvent : public Event {
- public:
-  // For testing.
-  class TestApi : public Event::TestApi {
-   public:
-    explicit TestApi(LocatedEvent* located_event)
-        : Event::TestApi(located_event),
-          located_event_(located_event) {}
-
-    void set_location(const gfx::Point& location) {
-      located_event_->location_ = location;
-    }
-
-   private:
-    TestApi();
-    LocatedEvent* located_event_;
-  };
-
-  virtual ~LocatedEvent();
-
-  int x() const { return location_.x(); }
-  int y() const { return location_.y(); }
-  gfx::Point location() const { return location_; }
-  gfx::Point root_location() const { return root_location_; }
-
-  // Applies |root_transform| to the event.
-  // This is applied to both |location_| and |root_location_|.
-  virtual void UpdateForRootTransform(const ui::Transform& root_transform);
-
- protected:
-  explicit LocatedEvent(const base::NativeEvent& native_event);
-
-  // Create a new LocatedEvent which is identical to the provided model.
-  // If source / target windows are provided, the model location will be
-  // converted from |source| coordinate system to |target| coordinate system.
-  LocatedEvent(const LocatedEvent& model, Window* source, Window* target);
-
-  // Used for synthetic events in testing.
-  LocatedEvent(ui::EventType type,
-               const gfx::Point& location,
-               const gfx::Point& root_location,
-               int flags);
-
-  gfx::Point location_;
-
-  gfx::Point root_location_;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(LocatedEvent);
-};
-
-class AURA_EXPORT MouseEvent : public LocatedEvent {
- public:
-  explicit MouseEvent(const base::NativeEvent& native_event);
-
-  // Create a new MouseEvent based on the provided model.
-  // Uses the provided |type| and |flags| for the new event.
-  // If source / target windows are provided, the model location will be
-  // converted from |source| coordinate system to |target| coordinate system.
-  MouseEvent(const MouseEvent& model, Window* source, Window* target);
-  MouseEvent(const MouseEvent& model,
-             Window* source,
-             Window* target,
-             ui::EventType type,
-             int flags);
-
-  // Used for synthetic events in testing and by the gesture recognizer.
-  MouseEvent(ui::EventType type,
-             const gfx::Point& location,
-             const gfx::Point& root_location,
-             int flags);
-
-  // Compares two mouse down events and returns true if the second one should
-  // be considered a repeat of the first.
-  static bool IsRepeatedClickEvent(
-      const MouseEvent& event1,
-      const MouseEvent& event2);
-
-  // Get the click count. Can be 1, 2 or 3 for mousedown messages, 0 otherwise.
-  int GetClickCount() const;
-
-  // Set the click count for a mousedown message. Can be 1, 2 or 3.
-  void SetClickCount(int click_count);
-
- private:
-  gfx::Point root_location_;
-
-  static MouseEvent* last_click_event_;
-  // Returns the repeat count based on the previous mouse click, if it is
-  // recent enough and within a small enough distance.
-  static int GetRepeatCount(const MouseEvent& click_event);
-
-  DISALLOW_COPY_AND_ASSIGN(MouseEvent);
-};
-
-class AURA_EXPORT TouchEvent : public LocatedEvent,
-                               public ui::TouchEvent {
- public:
-  explicit TouchEvent(const base::NativeEvent& native_event);
-
-  // Create a new TouchEvent which is identical to the provided model.
-  // If source / target windows are provided, the model location will be
-  // converted from |source| coordinate system to |target| coordinate system.
-  TouchEvent(const TouchEvent& model, Window* source, Window* target);
-
-  TouchEvent(ui::EventType type,
-             const gfx::Point& root_location,
-             int touch_id,
-             base::TimeDelta time_stamp);
-
-  virtual ~TouchEvent();
-
-  int touch_id() const { return touch_id_; }
-  float radius_x() const { return radius_x_; }
-  float radius_y() const { return radius_y_; }
-  float rotation_angle() const { return rotation_angle_; }
-  float force() const { return force_; }
-
-  // Used for unit tests.
-  void set_radius_x(const float r) { radius_x_ = r; }
-  void set_radius_y(const float r) { radius_y_ = r; }
-
-  // Overridden from LocatedEvent.
-  virtual void UpdateForRootTransform(
-      const ui::Transform& root_transform) OVERRIDE;
-
-  // Overridden from ui::TouchEvent.
-  virtual ui::EventType GetEventType() const OVERRIDE;
-  virtual gfx::Point GetLocation() const OVERRIDE;
-  virtual int GetTouchId() const OVERRIDE;
-  virtual int GetEventFlags() const OVERRIDE;
-  virtual base::TimeDelta GetTimestamp() const OVERRIDE;
-  virtual float RadiusX() const OVERRIDE;
-  virtual float RadiusY() const OVERRIDE;
-  virtual float RotationAngle() const OVERRIDE;
-  virtual float Force() const OVERRIDE;
-
- private:
-  // The identity (typically finger) of the touch starting at 0 and incrementing
-  // for each separable additional touch that the hardware can detect.
-  const int touch_id_;
-
-  // Radius of the X (major) axis of the touch ellipse. 0.0 if unknown.
-  float radius_x_;
-
-  // Radius of the Y (minor) axis of the touch ellipse. 0.0 if unknown.
-  float radius_y_;
-
-  // Angle of the major axis away from the X axis. Default 0.0.
-  const float rotation_angle_;
-
-  // Force (pressure) of the touch. Normalized to be [0, 1]. Default to be 0.0.
-  const float force_;
-
-  DISALLOW_COPY_AND_ASSIGN(TouchEvent);
-};
-
-class AURA_EXPORT KeyEvent : public Event {
- public:
-  KeyEvent(const base::NativeEvent& native_event, bool is_char);
-
-  // Used for synthetic events in testing.
-  KeyEvent(ui::EventType type,
-           ui::KeyboardCode key_code,
-           int flags);
-
-  // These setters allow an I18N virtual keyboard to fabricate a keyboard event
-  // which does not have a corresponding ui::KeyboardCode (example: U+00E1 Latin
-  // small letter A with acute, U+0410 Cyrillic capital letter A.)
-  // GetCharacter() and GetUnmodifiedCharacter() return the character.
-  void set_character(uint16 character) { character_ = character; }
-  void set_unmodified_character(uint16 unmodified_character) {
-    unmodified_character_ = unmodified_character;
-  }
-
-  // Gets the character generated by this key event. It only supports Unicode
-  // BMP characters.
-  uint16 GetCharacter() const;
-
-  // Gets the character generated by this key event ignoring concurrently-held
-  // modifiers (except shift).
-  uint16 GetUnmodifiedCharacter() const;
-
-  // Returns the copy of this key event. Used in NativeWebKeyboardEvent.
-  KeyEvent* Copy();
-
-  ui::KeyboardCode key_code() const { return key_code_; }
-  bool is_char() const { return is_char_; }
-
-  // This is only intended to be used externally by classes that are modifying
-  // events in EventFilter::PreHandleKeyEvent().  set_character() should also be
-  // called.
-  void set_key_code(ui::KeyboardCode key_code) { key_code_ = key_code; }
-
- private:
-  ui::KeyboardCode key_code_;
-  // True if this is a translated character event (vs. a raw key down). Both
-  // share the same type: ui::ET_KEY_PRESSED.
-  bool is_char_;
-
-  uint16 character_;
-  uint16 unmodified_character_;
-};
-
-// A key event which is translated by an input method (IME).
-// For example, if an IME receives a KeyEvent(ui::VKEY_SPACE), and it does not
-// consume the key, the IME usually generates and dispatches a
-// TranslatedKeyEvent(ui::VKEY_SPACE) event. If the IME receives a KeyEvent and
-// it does consume the event, it might dispatch a
-// TranslatedKeyEvent(ui::VKEY_PROCESSKEY) event as defined in the DOM spec.
-class AURA_EXPORT TranslatedKeyEvent : public aura::KeyEvent {
- public:
-  TranslatedKeyEvent(const base::NativeEvent& native_event, bool is_char);
-
-  // Used for synthetic events such as a VKEY_PROCESSKEY key event.
-  TranslatedKeyEvent(bool is_press,
-                     ui::KeyboardCode key_code,
-                     int flags);
-
-  // Changes the type() of the object from ET_TRANSLATED_KEY_* to ET_KEY_* so
-  // that RenderWidgetHostViewAura and NativeWidgetAura could handle the event.
-  void ConvertToKeyEvent();
-};
-
-class AURA_EXPORT DropTargetEvent : public LocatedEvent {
- public:
-  DropTargetEvent(const ui::OSExchangeData& data,
-                  const gfx::Point& location,
-                  const gfx::Point& root_location,
-                  int source_operations)
-      : LocatedEvent(ui::ET_DROP_TARGET_EVENT, location, root_location, 0),
-        data_(data),
-        source_operations_(source_operations) {
-  }
-
-  const ui::OSExchangeData& data() const { return data_; }
-  int source_operations() const { return source_operations_; }
-
- private:
-  // Data associated with the drag/drop session.
-  const ui::OSExchangeData& data_;
-
-  // Bitmask of supported ui::DragDropTypes::DragOperation by the source.
-  int source_operations_;
-
-  DISALLOW_COPY_AND_ASSIGN(DropTargetEvent);
-};
-
-class AURA_EXPORT ScrollEvent : public MouseEvent {
- public:
-  explicit ScrollEvent(const base::NativeEvent& native_event);
-  ScrollEvent(const ScrollEvent& model,
-              Window* source,
-              Window* target,
-              ui::EventType type,
-              int flags)
-      : MouseEvent(model, source, target, type, flags),
-        x_offset_(model.x_offset_),
-        y_offset_(model.y_offset_) {
-  }
-
-  float x_offset() const { return x_offset_; }
-  float y_offset() const { return y_offset_; }
-
- private:
-  float x_offset_;
-  float y_offset_;
-
-  DISALLOW_COPY_AND_ASSIGN(ScrollEvent);
-};
-
-class AURA_EXPORT GestureEvent : public LocatedEvent,
-                                 public ui::GestureEvent {
- public:
-  GestureEvent(ui::EventType type,
-               int x,
-               int y,
-               int flags,
-               base::Time time_stamp,
-               const ui::GestureEventDetails& details,
-               unsigned int touch_ids_bitfield);
-
-  // Create a new GestureEvent which is identical to the provided model.
-  // If source / target windows are provided, the model location will be
-  // converted from |source| coordinate system to |target| coordinate system.
-  GestureEvent(const GestureEvent& model, Window* source, Window* target);
-
-  virtual ~GestureEvent();
-
-  const ui::GestureEventDetails& details() const { return details_; }
-
-  // Returns the lowest touch-id of any of the touches which make up this
-  // gesture.
-  // If there are no touches associated with this gesture, returns -1.
-  virtual int GetLowestTouchId() const OVERRIDE;
-
- private:
-  ui::GestureEventDetails details_;
-
-  // The set of indices of ones in the binary representation of
-  // touch_ids_bitfield_ is the set of touch_ids associate with this gesture.
-  // This value is stored as a bitfield because the number of touch ids varies,
-  // but we currently don't need more than 32 touches at a time.
-  const unsigned int touch_ids_bitfield_;
-
-  DISALLOW_COPY_AND_ASSIGN(GestureEvent);
-};
-
-}  // namespace aura
-
-#endif  // UI_AURA_EVENT_H_