diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-27 23:30:22 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-27 23:30:22 +0000 |
| commit | 62cb33cae4bad68a085b50832c8a7f1e1c2e917c (patch) | |
| tree | 4eddbf29c7ae1c41fd1300ae4ce95b817404bbaf /chrome/views | |
| parent | 57346c5659ada3c2a06095afac6e53bedf41ab94 (diff) | |
| download | chromium_src-62cb33cae4bad68a085b50832c8a7f1e1c2e917c.zip chromium_src-62cb33cae4bad68a085b50832c8a7f1e1c2e917c.tar.gz chromium_src-62cb33cae4bad68a085b50832c8a7f1e1c2e917c.tar.bz2 | |
Use Webkit::WebInputEvent and remove webkit/glue/webinputevent.
This change adds a temporary dependency on src/KeyIdentifier.{h,cpp} which I am going to remove after this CL. I didn't want to grow this CL any larger.
R=dglazkov
Review URL: http://codereview.chromium.org/53099
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12728 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/views')
| -rw-r--r-- | chrome/views/event.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/views/event.cc b/chrome/views/event.cc index af603cb..d0b375c 100644 --- a/chrome/views/event.cc +++ b/chrome/views/event.cc @@ -5,7 +5,9 @@ #include "chrome/views/event.h" #include "chrome/views/view.h" -#include "webkit/glue/webinputevent.h" +#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" + +using WebKit::WebInputEvent; namespace views { @@ -22,11 +24,11 @@ Event::Event(EventType type, int flags) // static int Event::ConvertWebInputEventFlags(int web_input_event_flags) { int r = 0; - if (web_input_event_flags & WebInputEvent::SHIFT_KEY) + if (web_input_event_flags & WebInputEvent::ShiftKey) r |= EF_SHIFT_DOWN; - if (web_input_event_flags & WebInputEvent::CTRL_KEY) + if (web_input_event_flags & WebInputEvent::ControlKey) r |= EF_CONTROL_DOWN; - if (web_input_event_flags & WebInputEvent::ALT_KEY) + if (web_input_event_flags & WebInputEvent::AltKey) r |= EF_ALT_DOWN; return r; } @@ -53,4 +55,3 @@ MouseEvent::MouseEvent(const MouseEvent& model, View* from, View* to) } } // namespace views - |