Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(530)

Side by Side Diff: ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.cc

Issue 1136503003: Consolidate ui/events/keycodes/dom[34]/ into .../dom/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/dom3/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()) {
(...skipping 13 matching lines...) Expand all
35 35
36 ScopedDisableInternalMouseAndKeyboardOzone:: 36 ScopedDisableInternalMouseAndKeyboardOzone::
37 ~ScopedDisableInternalMouseAndKeyboardOzone() { 37 ~ScopedDisableInternalMouseAndKeyboardOzone() {
38 ui::InputController* input_controller = 38 ui::InputController* input_controller =
39 ui::OzonePlatform::GetInstance()->GetInputController(); 39 ui::OzonePlatform::GetInstance()->GetInputController();
40 input_controller->EnableInternalTouchpad(); 40 input_controller->EnableInternalTouchpad();
41 input_controller->EnableInternalKeyboard(); 41 input_controller->EnableInternalKeyboard();
42 } 42 }
43 43
44 } // namespace ash 44 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698