| 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/tablet_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 { |
| (...skipping 27 matching lines...) Expand all Loading... |
| 43 if (!should_ignore_touch_pad_) { | 43 if (!should_ignore_touch_pad_) { |
| 44 input_controller->SetInternalTouchpadEnabled(true); | 44 input_controller->SetInternalTouchpadEnabled(true); |
| 45 Shell::Get()->cursor_manager()->ShowCursor(); | 45 Shell::Get()->cursor_manager()->ShowCursor(); |
| 46 } | 46 } |
| 47 | 47 |
| 48 input_controller->SetInternalKeyboardFilter(false /* enable_filter */, | 48 input_controller->SetInternalKeyboardFilter(false /* enable_filter */, |
| 49 std::vector<ui::DomCode>()); | 49 std::vector<ui::DomCode>()); |
| 50 } | 50 } |
| 51 | 51 |
| 52 } // namespace ash | 52 } // namespace ash |
| OLD | NEW |