OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/sticky_keys/sticky_keys_controller.h" | 5 #include "ash/sticky_keys/sticky_keys_controller.h" |
6 | 6 |
7 #include "ash/sticky_keys/sticky_keys_overlay.h" | 7 #include "ash/sticky_keys/sticky_keys_overlay.h" |
8 #include "base/debug/stack_trace.h" | 8 #include "base/debug/stack_trace.h" |
9 #include "ui/aura/window.h" | 9 #include "ui/aura/window.h" |
10 #include "ui/aura/window_tracker.h" | 10 #include "ui/aura/window_tracker.h" |
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
165 if (!enabled_) | 165 if (!enabled_) |
166 return ui::EVENT_REWRITE_CONTINUE; | 166 return ui::EVENT_REWRITE_CONTINUE; |
167 int mod_down_flags = 0; | 167 int mod_down_flags = 0; |
168 bool released = false; | 168 bool released = false; |
169 bool consumed = HandleScrollEvent(event, &mod_down_flags, &released); | 169 bool consumed = HandleScrollEvent(event, &mod_down_flags, &released); |
170 UpdateOverlay(); | 170 UpdateOverlay(); |
171 return RewriteUpdate(consumed, released, mod_down_flags, flags); | 171 return RewriteUpdate(consumed, released, mod_down_flags, flags); |
172 } | 172 } |
173 | 173 |
174 ui::EventRewriteStatus StickyKeysController::NextDispatchEvent( | 174 ui::EventRewriteStatus StickyKeysController::NextDispatchEvent( |
175 scoped_ptr<ui::Event>* new_event) { | 175 std::unique_ptr<ui::Event>* new_event) { |
176 DCHECK(new_event); | 176 DCHECK(new_event); |
177 new_event->reset(); | 177 new_event->reset(); |
178 int remaining = shift_sticky_key_->GetModifierUpEvent(new_event) + | 178 int remaining = shift_sticky_key_->GetModifierUpEvent(new_event) + |
179 alt_sticky_key_->GetModifierUpEvent(new_event) + | 179 alt_sticky_key_->GetModifierUpEvent(new_event) + |
180 altgr_sticky_key_->GetModifierUpEvent(new_event) + | 180 altgr_sticky_key_->GetModifierUpEvent(new_event) + |
181 ctrl_sticky_key_->GetModifierUpEvent(new_event) + | 181 ctrl_sticky_key_->GetModifierUpEvent(new_event) + |
182 mod3_sticky_key_->GetModifierUpEvent(new_event) + | 182 mod3_sticky_key_->GetModifierUpEvent(new_event) + |
183 search_sticky_key_->GetModifierUpEvent(new_event); | 183 search_sticky_key_->GetModifierUpEvent(new_event); |
184 if (!new_event) | 184 if (!new_event) |
185 return ui::EVENT_REWRITE_CONTINUE; | 185 return ui::EVENT_REWRITE_CONTINUE; |
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
302 (event.type() == ui::ET_SCROLL_FLING_START || direction_changed)) { | 302 (event.type() == ui::ET_SCROLL_FLING_START || direction_changed)) { |
303 current_state_ = STICKY_KEY_STATE_DISABLED; | 303 current_state_ = STICKY_KEY_STATE_DISABLED; |
304 scroll_delta_ = 0; | 304 scroll_delta_ = 0; |
305 *released = true; | 305 *released = true; |
306 return false; | 306 return false; |
307 } | 307 } |
308 | 308 |
309 return false; | 309 return false; |
310 } | 310 } |
311 | 311 |
312 int StickyKeysHandler::GetModifierUpEvent(scoped_ptr<ui::Event>* new_event) { | 312 int StickyKeysHandler::GetModifierUpEvent( |
| 313 std::unique_ptr<ui::Event>* new_event) { |
313 if (current_state_ != STICKY_KEY_STATE_DISABLED || !modifier_up_event_) | 314 if (current_state_ != STICKY_KEY_STATE_DISABLED || !modifier_up_event_) |
314 return 0; | 315 return 0; |
315 DCHECK(new_event); | 316 DCHECK(new_event); |
316 if (*new_event) | 317 if (*new_event) |
317 return 1; | 318 return 1; |
318 new_event->reset(modifier_up_event_.release()); | 319 new_event->reset(modifier_up_event_.release()); |
319 return 0; | 320 return 0; |
320 } | 321 } |
321 | 322 |
322 StickyKeysHandler::KeyEventType StickyKeysHandler::TranslateKeyEvent( | 323 StickyKeysHandler::KeyEventType StickyKeysHandler::TranslateKeyEvent( |
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
423 return false; | 424 return false; |
424 case OTHER_MODIFIER_DOWN: | 425 case OTHER_MODIFIER_DOWN: |
425 case OTHER_MODIFIER_UP: | 426 case OTHER_MODIFIER_UP: |
426 return false; | 427 return false; |
427 } | 428 } |
428 NOTREACHED(); | 429 NOTREACHED(); |
429 return false; | 430 return false; |
430 } | 431 } |
431 | 432 |
432 } // namespace ash | 433 } // namespace ash |
OLD | NEW |