| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "ash/accelerators/key_hold_detector.h" | 5 #include "ash/accelerators/key_hold_detector.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "base/threading/thread_task_runner_handle.h" | 10 #include "base/threading/thread_task_runner_handle.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 return; | 23 return; |
| 24 ui::KeyEvent event(key_event); | 24 ui::KeyEvent event(key_event); |
| 25 aura::Window* target = *(tracker->windows().begin()); | 25 aura::Window* target = *(tracker->windows().begin()); |
| 26 ignore_result( | 26 ignore_result( |
| 27 target->GetHost()->event_processor()->OnEventFromSource(&event)); | 27 target->GetHost()->event_processor()->OnEventFromSource(&event)); |
| 28 } | 28 } |
| 29 | 29 |
| 30 void PostPressedEvent(ui::KeyEvent* event) { | 30 void PostPressedEvent(ui::KeyEvent* event) { |
| 31 // Modify RELEASED event to PRESSED event. | 31 // Modify RELEASED event to PRESSED event. |
| 32 const ui::KeyEvent pressed_event( | 32 const ui::KeyEvent pressed_event( |
| 33 ui::ET_KEY_PRESSED, | 33 ui::ET_KEY_PRESSED, event->key_code(), event->code(), |
| 34 event->key_code(), | |
| 35 event->code(), | |
| 36 event->flags() | ui::EF_SHIFT_DOWN | ui::EF_IS_SYNTHESIZED); | 34 event->flags() | ui::EF_SHIFT_DOWN | ui::EF_IS_SYNTHESIZED); |
| 37 std::unique_ptr<aura::WindowTracker> tracker(new aura::WindowTracker); | 35 std::unique_ptr<aura::WindowTracker> tracker(new aura::WindowTracker); |
| 38 tracker->Add(static_cast<aura::Window*>(event->target())); | 36 tracker->Add(static_cast<aura::Window*>(event->target())); |
| 39 | 37 |
| 40 base::ThreadTaskRunnerHandle::Get()->PostTask( | 38 base::ThreadTaskRunnerHandle::Get()->PostTask( |
| 41 FROM_HERE, | 39 FROM_HERE, |
| 42 base::Bind(&DispatchPressedEvent, pressed_event, base::Passed(&tracker))); | 40 base::Bind(&DispatchPressedEvent, pressed_event, base::Passed(&tracker))); |
| 43 } | 41 } |
| 44 | 42 |
| 45 } // namespace | 43 } // namespace |
| (...skipping 17 matching lines...) Expand all Loading... |
| 63 } | 61 } |
| 64 state_ = PRESSED; | 62 state_ = PRESSED; |
| 65 if (delegate_->ShouldStopEventPropagation()) { | 63 if (delegate_->ShouldStopEventPropagation()) { |
| 66 // Don't process ET_KEY_PRESSED event yet. The ET_KEY_PRESSED | 64 // Don't process ET_KEY_PRESSED event yet. The ET_KEY_PRESSED |
| 67 // event will be generated upon ET_KEY_RELEASEED event below. | 65 // event will be generated upon ET_KEY_RELEASEED event below. |
| 68 event->StopPropagation(); | 66 event->StopPropagation(); |
| 69 } | 67 } |
| 70 break; | 68 break; |
| 71 case PRESSED: | 69 case PRESSED: |
| 72 state_ = HOLD; | 70 state_ = HOLD; |
| 73 // pass through | 71 // pass through |
| 74 case HOLD: | 72 case HOLD: |
| 75 delegate_->OnKeyHold(event); | 73 delegate_->OnKeyHold(event); |
| 76 if (delegate_->ShouldStopEventPropagation()) | 74 if (delegate_->ShouldStopEventPropagation()) |
| 77 event->StopPropagation(); | 75 event->StopPropagation(); |
| 78 break; | 76 break; |
| 79 } | 77 } |
| 80 } else if (event->type() == ui::ET_KEY_RELEASED) { | 78 } else if (event->type() == ui::ET_KEY_RELEASED) { |
| 81 switch (state_) { | 79 switch (state_) { |
| 82 case INITIAL: | 80 case INITIAL: |
| 83 break; | 81 break; |
| 84 case PRESSED: { | 82 case PRESSED: { |
| 85 if (delegate_->ShouldStopEventPropagation()) { | 83 if (delegate_->ShouldStopEventPropagation()) { |
| 86 PostPressedEvent(event); | 84 PostPressedEvent(event); |
| 87 event->StopPropagation(); | 85 event->StopPropagation(); |
| 88 } | 86 } |
| 89 break; | 87 break; |
| 90 } | 88 } |
| 91 case HOLD: { | 89 case HOLD: { |
| 92 delegate_->OnKeyUnhold(event); | 90 delegate_->OnKeyUnhold(event); |
| 93 if (delegate_->ShouldStopEventPropagation()) | 91 if (delegate_->ShouldStopEventPropagation()) |
| 94 event->StopPropagation(); | 92 event->StopPropagation(); |
| 95 break; | 93 break; |
| 96 } | 94 } |
| 97 } | 95 } |
| 98 state_ = INITIAL; | 96 state_ = INITIAL; |
| 99 } | 97 } |
| 100 } | 98 } |
| 101 | 99 |
| 102 } // namespace ash | 100 } // namespace ash |
| OLD | NEW |