diff options
Diffstat (limited to 'ui')
-rw-r--r-- | ui/base/ime/chromeos/mock_ime_engine_handler.cc | 2 | ||||
-rw-r--r-- | ui/base/ime/input_method_ibus.cc | 2 | ||||
-rw-r--r-- | ui/events/event.cc | 14 | ||||
-rw-r--r-- | ui/events/event.h | 3 | ||||
-rw-r--r-- | ui/events/event_unittest.cc | 2 | ||||
-rw-r--r-- | ui/views/widget/desktop_aura/desktop_root_window_host_win.cc | 4 |
6 files changed, 5 insertions, 22 deletions
diff --git a/ui/base/ime/chromeos/mock_ime_engine_handler.cc b/ui/base/ime/chromeos/mock_ime_engine_handler.cc index 9597efa..f5e1723 100644 --- a/ui/base/ime/chromeos/mock_ime_engine_handler.cc +++ b/ui/base/ime/chromeos/mock_ime_engine_handler.cc @@ -48,7 +48,7 @@ void MockIMEEngineHandler::ProcessKeyEvent( const ui::KeyEvent& key_event, const KeyEventDoneCallback& callback) { ++process_key_event_call_count_; - last_processed_key_event_.reset(key_event.Copy()); + last_processed_key_event_.reset(new ui::KeyEvent(key_event)); last_passed_callback_ = callback; } diff --git a/ui/base/ime/input_method_ibus.cc b/ui/base/ime/input_method_ibus.cc index 492f874..85bb244 100644 --- a/ui/base/ime/input_method_ibus.cc +++ b/ui/base/ime/input_method_ibus.cc @@ -132,7 +132,7 @@ bool InputMethodIBus::DispatchKeyEvent(const ui::KeyEvent& event) { pending_key_events_.insert(current_keyevent_id_); - ui::KeyEvent* copied_event = event.Copy(); + ui::KeyEvent* copied_event = new ui::KeyEvent(event); GetEngine()->ProcessKeyEvent( event, base::Bind(&InputMethodIBus::ProcessKeyEventDone, diff --git a/ui/events/event.cc b/ui/events/event.cc index 1e4bdd0..63202cb 100644 --- a/ui/events/event.cc +++ b/ui/events/event.cc @@ -567,20 +567,6 @@ uint16 KeyEvent::GetCharacter() const { #endif } -KeyEvent* KeyEvent::Copy() const { -#if defined(USE_OZONE) - KeyEvent* copy = new KeyEvent(*this); -#else - KeyEvent* copy = HasNativeEvent() ? - new KeyEvent(::CopyNativeEvent(native_event()), is_char()) : - new KeyEvent(*this); -#endif -#if defined(USE_X11) - copy->set_delete_native_event(true); -#endif - return copy; -} - bool KeyEvent::IsUnicodeKeyCode() const { if (!IsAltDown()) return false; diff --git a/ui/events/event.h b/ui/events/event.h index 78dd788..5f90b82 100644 --- a/ui/events/event.h +++ b/ui/events/event.h @@ -528,9 +528,6 @@ class EVENTS_EXPORT KeyEvent : public Event { // BMP characters. uint16 GetCharacter() const; - // Returns the copy of this key event. Used in NativeWebKeyboardEvent. - KeyEvent* Copy() const; - KeyboardCode key_code() const { return key_code_; } bool is_char() const { return is_char_; } diff --git a/ui/events/event_unittest.cc b/ui/events/event_unittest.cc index c73b2aa..012fc60 100644 --- a/ui/events/event_unittest.cc +++ b/ui/events/event_unittest.cc @@ -264,7 +264,7 @@ TEST(EventTest, NormalizeKeyEventFlags) { TEST(EventTest, KeyEventCopy) { KeyEvent key(ET_KEY_PRESSED, VKEY_A, EF_NONE, false); - scoped_ptr<KeyEvent> copied_key(key.Copy()); + scoped_ptr<KeyEvent> copied_key(new KeyEvent(key)); EXPECT_EQ(copied_key->type(), key.type()); EXPECT_EQ(copied_key->key_code(), key.key_code()); } diff --git a/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc b/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc index 5e5cf4a..9fef8cf 100644 --- a/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc +++ b/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc @@ -820,8 +820,8 @@ bool DesktopRootWindowHostWin::HandleKeyEvent(const ui::KeyEvent& event) { bool DesktopRootWindowHostWin::HandleUntranslatedKeyEvent( const ui::KeyEvent& event) { - scoped_ptr<ui::KeyEvent> duplicate_event(event.Copy()); - return delegate_->OnHostKeyEvent(duplicate_event.get()); + ui::KeyEvent duplicate_event(event); + return delegate_->OnHostKeyEvent(&duplicate_event); } void DesktopRootWindowHostWin::HandleTouchEvent( |