| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/content_accelerators/accelerator_util.h" | 5 #include "ui/content_accelerators/accelerator_util.h" |
| 6 | 6 |
| 7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
| 8 #include "third_party/WebKit/public/platform/WebInputEvent.h" | 8 #include "third_party/WebKit/public/platform/WebInputEvent.h" |
| 9 #include "ui/events/event.h" | 9 #include "ui/events/event.h" |
| 10 #include "ui/events/event_constants.h" | 10 #include "ui/events/event_constants.h" |
| 11 | 11 |
| 12 namespace ui { | 12 namespace ui { |
| 13 | 13 |
| 14 namespace { | 14 namespace { |
| 15 | 15 |
| 16 int GetModifiersFromNativeWebKeyboardEvent( | 16 int GetModifiersFromNativeWebKeyboardEvent( |
| 17 const content::NativeWebKeyboardEvent& event) { | 17 const content::NativeWebKeyboardEvent& event) { |
| 18 int modifiers = ui::EF_NONE; | 18 int modifiers = ui::EF_NONE; |
| 19 if (event.modifiers & content::NativeWebKeyboardEvent::ShiftKey) | 19 if (event.modifiers() & content::NativeWebKeyboardEvent::ShiftKey) |
| 20 modifiers |= ui::EF_SHIFT_DOWN; | 20 modifiers |= ui::EF_SHIFT_DOWN; |
| 21 if (event.modifiers & content::NativeWebKeyboardEvent::ControlKey) | 21 if (event.modifiers() & content::NativeWebKeyboardEvent::ControlKey) |
| 22 modifiers |= ui::EF_CONTROL_DOWN; | 22 modifiers |= ui::EF_CONTROL_DOWN; |
| 23 if (event.modifiers & content::NativeWebKeyboardEvent::AltKey) | 23 if (event.modifiers() & content::NativeWebKeyboardEvent::AltKey) |
| 24 modifiers |= ui::EF_ALT_DOWN; | 24 modifiers |= ui::EF_ALT_DOWN; |
| 25 #if defined(OS_MACOSX) || defined(OS_CHROMEOS) | 25 #if defined(OS_MACOSX) || defined(OS_CHROMEOS) |
| 26 if (event.modifiers & content::NativeWebKeyboardEvent::MetaKey) | 26 if (event.modifiers() & content::NativeWebKeyboardEvent::MetaKey) |
| 27 modifiers |= ui::EF_COMMAND_DOWN; | 27 modifiers |= ui::EF_COMMAND_DOWN; |
| 28 #endif | 28 #endif |
| 29 #if defined(USE_AURA) | 29 #if defined(USE_AURA) |
| 30 if (event.os_event && static_cast<ui::KeyEvent*>(event.os_event)->is_repeat()) | 30 if (event.os_event && static_cast<ui::KeyEvent*>(event.os_event)->is_repeat()) |
| 31 modifiers |= ui::EF_IS_REPEAT; | 31 modifiers |= ui::EF_IS_REPEAT; |
| 32 #endif | 32 #endif |
| 33 return modifiers; | 33 return modifiers; |
| 34 } | 34 } |
| 35 | 35 |
| 36 } // namespace | 36 } // namespace |
| 37 | 37 |
| 38 ui::Accelerator GetAcceleratorFromNativeWebKeyboardEvent( | 38 ui::Accelerator GetAcceleratorFromNativeWebKeyboardEvent( |
| 39 const content::NativeWebKeyboardEvent& event) { | 39 const content::NativeWebKeyboardEvent& event) { |
| 40 ui::Accelerator accelerator( | 40 ui::Accelerator accelerator( |
| 41 static_cast<ui::KeyboardCode>(event.windowsKeyCode), | 41 static_cast<ui::KeyboardCode>(event.windowsKeyCode), |
| 42 GetModifiersFromNativeWebKeyboardEvent(event)); | 42 GetModifiersFromNativeWebKeyboardEvent(event)); |
| 43 if (event.type == blink::WebInputEvent::KeyUp) | 43 if (event.type() == blink::WebInputEvent::KeyUp) |
| 44 accelerator.set_type(ui::ET_KEY_RELEASED); | 44 accelerator.set_type(ui::ET_KEY_RELEASED); |
| 45 return accelerator; | 45 return accelerator; |
| 46 } | 46 } |
| 47 | 47 |
| 48 } // namespace ui | 48 } // namespace ui |
| OLD | NEW |