OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/scoped_disable_internal_mouse_and_keyboard_ozone.
h" | 5 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.
h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 | 8 |
9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
10 #include "ui/aura/client/cursor_client.h" | 10 #include "ui/aura/client/cursor_client.h" |
11 #include "ui/events/keycodes/dom/dom_code.h" | 11 #include "ui/events/keycodes/dom/dom_code.h" |
12 #include "ui/ozone/public/input_controller.h" | 12 #include "ui/ozone/public/input_controller.h" |
13 #include "ui/ozone/public/ozone_platform.h" | 13 #include "ui/ozone/public/ozone_platform.h" |
14 | 14 |
15 namespace ash { | 15 namespace ash { |
16 | 16 |
17 ScopedDisableInternalMouseAndKeyboardOzone:: | 17 ScopedDisableInternalMouseAndKeyboardOzone:: |
18 ScopedDisableInternalMouseAndKeyboardOzone() { | 18 ScopedDisableInternalMouseAndKeyboardOzone() { |
19 ui::InputController* input_controller = | 19 ui::InputController* input_controller = |
20 ui::OzonePlatform::GetInstance()->GetInputController(); | 20 ui::OzonePlatform::GetInstance()->GetInputController(); |
21 if (input_controller->HasTouchpad()) { | 21 if (input_controller->HasTouchpad() && |
| 22 input_controller->IsInternalTouchpadEnabled()) { |
| 23 should_ignore_touch_pad_ = false; |
22 input_controller->SetInternalTouchpadEnabled(false); | 24 input_controller->SetInternalTouchpadEnabled(false); |
23 aura::client::GetCursorClient(Shell::GetInstance()->GetPrimaryRootWindow()) | 25 Shell::GetInstance()->cursor_manager()->HideCursor(); |
24 ->HideCursor(); | |
25 } | 26 } |
26 | 27 |
27 // Allow the acccessible keys present on the side of some devices to continue | 28 // Allow the acccessible keys present on the side of some devices to continue |
28 // working. | 29 // working. |
29 std::vector<ui::DomCode> allowed_keys; | 30 std::vector<ui::DomCode> allowed_keys; |
30 allowed_keys.push_back(ui::DomCode::VOLUME_DOWN); | 31 allowed_keys.push_back(ui::DomCode::VOLUME_DOWN); |
31 allowed_keys.push_back(ui::DomCode::VOLUME_UP); | 32 allowed_keys.push_back(ui::DomCode::VOLUME_UP); |
32 allowed_keys.push_back(ui::DomCode::POWER); | 33 allowed_keys.push_back(ui::DomCode::POWER); |
33 input_controller->SetInternalKeyboardFilter(true /* enable_filter */, | 34 input_controller->SetInternalKeyboardFilter(true /* enable_filter */, |
34 allowed_keys); | 35 allowed_keys); |
35 } | 36 } |
36 | 37 |
37 ScopedDisableInternalMouseAndKeyboardOzone:: | 38 ScopedDisableInternalMouseAndKeyboardOzone:: |
38 ~ScopedDisableInternalMouseAndKeyboardOzone() { | 39 ~ScopedDisableInternalMouseAndKeyboardOzone() { |
39 ui::InputController* input_controller = | 40 ui::InputController* input_controller = |
40 ui::OzonePlatform::GetInstance()->GetInputController(); | 41 ui::OzonePlatform::GetInstance()->GetInputController(); |
41 input_controller->SetInternalTouchpadEnabled(true); | 42 |
| 43 if (!should_ignore_touch_pad_) { |
| 44 input_controller->SetInternalTouchpadEnabled(true); |
| 45 Shell::GetInstance()->cursor_manager()->ShowCursor(); |
| 46 } |
| 47 |
42 input_controller->SetInternalKeyboardFilter(false /* enable_filter */, | 48 input_controller->SetInternalKeyboardFilter(false /* enable_filter */, |
43 std::vector<ui::DomCode>()); | 49 std::vector<ui::DomCode>()); |
44 } | 50 } |
45 | 51 |
46 } // namespace ash | 52 } // namespace ash |
OLD | NEW |