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/wm/maximize_mode/maximize_mode_event_blocker.h" | 5 #include "ash/wm/maximize_mode/maximize_mode_event_blocker.h" |
6 | 6 |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "ui/aura/client/cursor_client.h" | 9 #include "ui/aura/client/cursor_client.h" |
10 #include "ui/events/event_targeter.h" | 10 #include "ui/events/event_targeter.h" |
11 #include "ui/events/keycodes/keyboard_codes_posix.h" | |
11 | 12 |
12 namespace ash { | 13 namespace ash { |
13 | 14 |
14 namespace { | 15 namespace { |
15 | 16 |
16 // Event targeter to prevent delivery of mouse and touchpad events while | 17 // Event targeter to prevent delivery of mouse and touchpad events while |
17 // maximize mode is active. Other events such as touch are passed on to the | 18 // maximize mode is active. Other events such as touch are passed on to the |
18 // default targeter. | 19 // default targeter. |
19 // TODO(flackr): This should only stop events from the internal keyboard and | 20 // TODO(flackr): This should only stop events from the internal keyboard and |
20 // touchpad. | 21 // touchpad. |
(...skipping 26 matching lines...) Expand all Loading... | |
47 } | 48 } |
48 | 49 |
49 void BlockKeyboardAndTouchpadTargeter::SetDefaultTargeter( | 50 void BlockKeyboardAndTouchpadTargeter::SetDefaultTargeter( |
50 ui::EventTargeter* default_targeter) { | 51 ui::EventTargeter* default_targeter) { |
51 default_targeter_ = default_targeter; | 52 default_targeter_ = default_targeter; |
52 } | 53 } |
53 | 54 |
54 ui::EventTarget* BlockKeyboardAndTouchpadTargeter::FindTargetForEvent( | 55 ui::EventTarget* BlockKeyboardAndTouchpadTargeter::FindTargetForEvent( |
55 ui::EventTarget* root, | 56 ui::EventTarget* root, |
56 ui::Event* event) { | 57 ui::Event* event) { |
57 if (event->HasNativeEvent() && (event->IsMouseEvent() || event->IsKeyEvent())) | 58 if (event->HasNativeEvent()) { |
58 return NULL; | 59 if (event->IsMouseEvent()) |
60 return NULL; | |
61 if (event->IsKeyEvent()) { | |
62 ui::KeyEvent* keyEvent = static_cast<ui::KeyEvent*>(event); | |
63 if (keyEvent->key_code() != ui::VKEY_VOLUME_DOWN && | |
64 keyEvent->key_code() != ui::VKEY_VOLUME_UP) { | |
jonross
2014/04/29 17:32:09
Since this is a partial fix of the bug, add a todo
bruthig
2014/04/29 18:59:42
Done.
| |
65 return NULL; | |
66 } | |
67 } | |
68 } | |
59 return default_targeter_->FindTargetForEvent(root, event); | 69 return default_targeter_->FindTargetForEvent(root, event); |
60 } | 70 } |
61 | 71 |
62 } // namespace | 72 } // namespace |
63 | 73 |
64 MaximizeModeEventBlocker::MaximizeModeEventBlocker() { | 74 MaximizeModeEventBlocker::MaximizeModeEventBlocker() { |
65 Shell::GetInstance()->AddShellObserver(this); | 75 Shell::GetInstance()->AddShellObserver(this); |
66 | 76 |
67 // Hide the cursor as mouse events will be blocked. | 77 // Hide the cursor as mouse events will be blocked. |
68 aura::client::CursorClient* cursor_client_ = | 78 aura::client::CursorClient* cursor_client_ = |
(...skipping 22 matching lines...) Expand all Loading... | |
91 aura::Window* root_window) { | 101 aura::Window* root_window) { |
92 BlockKeyboardAndTouchpadTargeter* targeter = | 102 BlockKeyboardAndTouchpadTargeter* targeter = |
93 new BlockKeyboardAndTouchpadTargeter(); | 103 new BlockKeyboardAndTouchpadTargeter(); |
94 aura::ScopedWindowTargeter* scoped_targeter = new aura::ScopedWindowTargeter( | 104 aura::ScopedWindowTargeter* scoped_targeter = new aura::ScopedWindowTargeter( |
95 root_window, scoped_ptr<ui::EventTargeter>(targeter)); | 105 root_window, scoped_ptr<ui::EventTargeter>(targeter)); |
96 targeter->SetDefaultTargeter(scoped_targeter->old_targeter()); | 106 targeter->SetDefaultTargeter(scoped_targeter->old_targeter()); |
97 targeters_.push_back(scoped_targeter); | 107 targeters_.push_back(scoped_targeter); |
98 } | 108 } |
99 | 109 |
100 } // namespace ash | 110 } // namespace ash |
OLD | NEW |