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

Unified Diff: ui/base/event.h

Issue 10825353: Clean up some detritus that accumulated during the fixing of 125937. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 months 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
« no previous file with comments | « no previous file | ui/base/event.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/event.h
===================================================================
--- ui/base/event.h (revision 151623)
+++ ui/base/event.h (working copy)
@@ -20,12 +20,6 @@
namespace ui {
class Transform;
-#if defined(USE_AURA)
-typedef Event* NativeEvent;
-#else
-typedef base::NativeEvent NativeEvent;
-#endif
-
class UI_EXPORT Event {
public:
virtual ~Event();
@@ -45,7 +39,6 @@
};
const base::NativeEvent& native_event() const { return native_event_; }
- const NativeEvent& ui_native_event() const { return ui_native_event_; }
EventType type() const { return type_; }
// time_stamp represents time since machine was booted.
const base::TimeDelta& time_stamp() const { return time_stamp_; }
@@ -112,8 +105,6 @@
void InitWithNativeEvent(const base::NativeEvent& native_event);
base::NativeEvent native_event_;
- // TODO(beng): check to see if this is necessary.
- NativeEvent ui_native_event_;
EventType type_;
base::TimeDelta time_stamp_;
int flags_;
@@ -170,7 +161,8 @@
const gfx::Point& root_location,
int flags);
- LocatedEvent(const LocatedEvent& model);
+ // Called from MouseEvent's copy ctor.
+ explicit LocatedEvent(const LocatedEvent& model);
gfx::Point location_;
@@ -257,6 +249,7 @@
int changed_button_flags() const { return changed_button_flags_; }
protected:
+ // Called from MouseWheelEvent's ctor.
explicit MouseEvent(const MouseEvent& model);
private:
@@ -279,7 +272,8 @@
// See |offset| for details.
static const int kWheelDelta;
- explicit MouseWheelEvent(const NativeEvent& native_event);
+ explicit MouseWheelEvent(const base::NativeEvent& native_event);
+ explicit MouseWheelEvent(const MouseEvent& mouse_event);
explicit MouseWheelEvent(const ScrollEvent& scroll_event);
// The amount to scroll. This is in multiples of kWheelDelta.
@@ -420,6 +414,8 @@
uint16 character_;
uint16 unmodified_character_;
+
+ DISALLOW_COPY_AND_ASSIGN(KeyEvent);
};
// A key event which is translated by an input method (IME).
@@ -438,6 +434,9 @@
// Changes the type() of the object from ET_TRANSLATED_KEY_* to ET_KEY_* so
// that RenderWidgetHostViewAura and NativeWidgetAura could handle the event.
void ConvertToKeyEvent();
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(TranslatedKeyEvent);
};
class UI_EXPORT DropTargetEvent : public LocatedEvent {
« no previous file with comments | « no previous file | ui/base/event.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698