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

Unified Diff: views/events/event.cc

Issue 8588064: views: Move bubble, events, focus and layout to ui/views/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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 | « views/events/event.h ('k') | views/events/event_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/events/event.cc
diff --git a/views/events/event.cc b/views/events/event.cc
deleted file mode 100644
index 67d165e6766310c6978fa7c03d1effd126f6976e..0000000000000000000000000000000000000000
--- a/views/events/event.cc
+++ /dev/null
@@ -1,200 +0,0 @@
-// Copyright (c) 2011 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.
-
-#include "views/events/event.h"
-
-#include "base/logging.h"
-#include "ui/base/keycodes/keyboard_code_conversion.h"
-#include "views/view.h"
-#include "views/widget/root_view.h"
-
-namespace views {
-
-////////////////////////////////////////////////////////////////////////////////
-// Event, protected:
-
-Event::Event(ui::EventType type, int flags)
- : type_(type),
- time_stamp_(base::Time::NowFromSystemTime()),
- flags_(flags) {
- // Safely initialize the pointer/struct to null/empty.
- memset(&native_event_, 0, sizeof(native_event_));
-#if defined(TOOLKIT_USES_GTK)
- gdk_event_ = NULL;
-#endif
-}
-
-Event::Event(const NativeEvent& native_event, ui::EventType type, int flags)
- : native_event_(native_event),
- type_(type),
- time_stamp_(base::Time::NowFromSystemTime()),
- flags_(flags) {
-#if defined(TOOLKIT_USES_GTK)
- gdk_event_ = NULL;
-#endif
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// LocatedEvent, protected:
-
-#if !defined(USE_AURA)
-LocatedEvent::LocatedEvent(const NativeEvent& native_event)
- : Event(native_event,
- ui::EventTypeFromNative(native_event),
- ui::EventFlagsFromNative(native_event)),
- location_(ui::EventLocationFromNative(native_event)) {
-}
-#endif
-
-// TODO(msw): Kill this legacy constructor when we update uses.
-LocatedEvent::LocatedEvent(ui::EventType type,
- const gfx::Point& location,
- int flags)
- : Event(type, flags),
- location_(location) {
-}
-
-LocatedEvent::LocatedEvent(const LocatedEvent& model,
- View* source,
- View* target)
- : Event(model),
- location_(model.location_) {
- if (target && target != source)
- View::ConvertPointToView(source, target, &location_);
-}
-
-LocatedEvent::LocatedEvent(const LocatedEvent& model, View* root)
- : Event(model),
- location_(model.location_) {
- View::ConvertPointFromWidget(root, &location_);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// KeyEvent, public:
-
-#if !defined(USE_AURA)
-KeyEvent::KeyEvent(const NativeEvent& native_event)
- : Event(native_event,
- ui::EventTypeFromNative(native_event),
- ui::EventFlagsFromNative(native_event)),
- key_code_(ui::KeyboardCodeFromNative(native_event)),
- character_(0),
- unmodified_character_(0) {
-}
-#endif
-
-KeyEvent::KeyEvent(ui::EventType type,
- ui::KeyboardCode key_code,
- int event_flags)
- : Event(type, event_flags),
- key_code_(key_code),
- character_(ui::GetCharacterFromKeyCode(key_code, event_flags)),
- unmodified_character_(0) {
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// MouseEvent, public:
-
-MouseEvent::MouseEvent(const NativeEvent& native_event)
- : LocatedEvent(native_event) {
-}
-
-MouseEvent::MouseEvent(const MouseEvent& model, View* source, View* target)
- : LocatedEvent(model, source, target) {
-}
-
-MouseEvent::MouseEvent(const TouchEvent& touch)
- : LocatedEvent(touch.native_event()) {
- // The location of the event is correctly extracted from the native event. But
- // it is necessary to update the event type.
- ui::EventType mtype = ui::ET_UNKNOWN;
- switch (touch.type()) {
- case ui::ET_TOUCH_RELEASED:
- mtype = ui::ET_MOUSE_RELEASED;
- break;
- case ui::ET_TOUCH_PRESSED:
- mtype = ui::ET_MOUSE_PRESSED;
- break;
- case ui::ET_TOUCH_MOVED:
- mtype = ui::ET_MOUSE_MOVED;
- break;
- default:
- NOTREACHED() << "Invalid mouse event.";
- }
- set_type(mtype);
-
- // It may not be possible to extract the button-information necessary for a
- // MouseEvent from the native event for a TouchEvent, so the flags are
- // explicitly updated as well. The button is approximated from the touchpoint
- // identity.
- int new_flags = flags() & ~(ui::EF_LEFT_BUTTON_DOWN |
- ui::EF_RIGHT_BUTTON_DOWN |
- ui::EF_MIDDLE_BUTTON_DOWN);
- int button = ui::EF_LEFT_BUTTON_DOWN;
- if (touch.identity() == 1)
- button = ui::EF_RIGHT_BUTTON_DOWN;
- else if (touch.identity() == 2)
- button = ui::EF_MIDDLE_BUTTON_DOWN;
- set_flags(new_flags | button);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// MouseWheelEvent, public:
-
-#if !defined(USE_AURA)
-MouseWheelEvent::MouseWheelEvent(const NativeEvent& native_event)
- : MouseEvent(native_event),
- offset_(ui::GetMouseWheelOffset(native_event)) {
-}
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// TouchEvent, public:
-
-TouchEvent::TouchEvent(ui::EventType type,
- int x,
- int y,
- int flags,
- int touch_id,
- float radius_x,
- float radius_y,
- float angle,
- float force)
- : LocatedEvent(type, gfx::Point(x, y), flags),
- touch_id_(touch_id),
- radius_x_(radius_x),
- radius_y_(radius_y),
- rotation_angle_(angle),
- force_(force) {
-}
-
-TouchEvent::TouchEvent(const TouchEvent& model, View* source, View* target)
- : LocatedEvent(model, source, target),
- touch_id_(model.touch_id_),
- radius_x_(model.radius_x_),
- radius_y_(model.radius_y_),
- rotation_angle_(model.rotation_angle_),
- force_(model.force_) {
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// TouchEvent, private:
-
-TouchEvent::TouchEvent(const TouchEvent& model, View* root)
- : LocatedEvent(model, root),
- touch_id_(model.touch_id_),
- radius_x_(model.radius_x_),
- radius_y_(model.radius_y_),
- rotation_angle_(model.rotation_angle_),
- force_(model.force_) {
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// MouseWheelEvent, public:
-
-// This value matches windows WHEEL_DELTA.
-// static
-const int MouseWheelEvent::kWheelDelta = 120;
-
-} // namespace views
« no previous file with comments | « views/events/event.h ('k') | views/events/event_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698