| Index: views/events/event_aura.cc
|
| diff --git a/views/events/event_aura.cc b/views/events/event_aura.cc
|
| index 57c9d973e21756bcbd33fc1231b3a43394605bdb..69c4770082550059bf0c6459971ba1e423149a1e 100644
|
| --- a/views/events/event_aura.cc
|
| +++ b/views/events/event_aura.cc
|
| @@ -9,43 +9,12 @@
|
|
|
| namespace views {
|
|
|
| -namespace {
|
| -
|
| -int GetKeyStateFlags() {
|
| - NOTIMPLEMENTED();
|
| - return 0;
|
| -}
|
| -
|
| -ui::EventType EventTypeFromNative(NativeEvent native_event) {
|
| - return native_event->type();
|
| -}
|
| -
|
| -int EventFlagsFromNative(NativeEvent native_event) {
|
| - return native_event->flags();
|
| -}
|
| -
|
| -}
|
| -
|
| -bool IsClientMouseEvent(const views::NativeEvent& native_event) {
|
| - return true;
|
| -}
|
| -
|
| -bool IsNonClientMouseEvent(const views::NativeEvent& native_event) {
|
| - return false;
|
| -}
|
| -
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // Event, private:
|
|
|
| void Event::Init() {
|
| }
|
|
|
| -void Event::InitWithNativeEvent(NativeEvent native_event) {
|
| - native_event_ = native_event;
|
| - // TODO(beng): remove once we rid views of Gtk/Gdk.
|
| - native_event_2_ = NULL;
|
| -}
|
| -
|
| void Event::InitWithNativeEvent2(NativeEvent2 native_event_2,
|
| FromNativeEvent2) {
|
| // No one should ever call this on Aura.
|
| @@ -74,7 +43,7 @@ LocatedEvent::LocatedEvent(NativeEvent2 native_event_2,
|
| // KeyEvent, public:
|
|
|
| KeyEvent::KeyEvent(NativeEvent native_event)
|
| - : Event(native_event, native_event->type(), GetKeyStateFlags()),
|
| + : Event(native_event, native_event->type(), native_event->flags()),
|
| key_code_(static_cast<aura::KeyEvent*>(native_event)->key_code()),
|
| character_(0),
|
| unmodified_character_(0) {
|
|
|