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

Side by Side Diff: ash/virtual_keyboard_controller.cc

Issue 889403003: Make PointerDeviceObserver work under Ozone (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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
OLDNEW
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/virtual_keyboard_controller.h" 5 #include "ash/virtual_keyboard_controller.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/wm/maximize_mode/maximize_mode_controller.h" 10 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 } 60 }
61 61
62 void VirtualKeyboardController::OnTouchscreenDeviceConfigurationChanged() { 62 void VirtualKeyboardController::OnTouchscreenDeviceConfigurationChanged() {
63 UpdateDevices(); 63 UpdateDevices();
64 } 64 }
65 65
66 void VirtualKeyboardController::OnKeyboardDeviceConfigurationChanged() { 66 void VirtualKeyboardController::OnKeyboardDeviceConfigurationChanged() {
67 UpdateDevices(); 67 UpdateDevices();
68 } 68 }
69 69
70 void VirtualKeyboardController::OnMouseDeviceConfigurationChanged() {
71 }
72
73 void VirtualKeyboardController::OnTouchpadDeviceConfigurationChanged() {
74 }
75
70 void VirtualKeyboardController::ToggleIgnoreExternalKeyboard() { 76 void VirtualKeyboardController::ToggleIgnoreExternalKeyboard() {
71 ignore_external_keyboard_ = !ignore_external_keyboard_; 77 ignore_external_keyboard_ = !ignore_external_keyboard_;
72 UpdateKeyboardEnabled(); 78 UpdateKeyboardEnabled();
73 } 79 }
74 80
75 void VirtualKeyboardController::UpdateDevices() { 81 void VirtualKeyboardController::UpdateDevices() {
76 ui::DeviceDataManager* device_data_manager = 82 ui::DeviceDataManager* device_data_manager =
77 ui::DeviceDataManager::GetInstance(); 83 ui::DeviceDataManager::GetInstance();
78 84
79 // Checks for touchscreens. 85 // Checks for touchscreens.
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 keyboard::SetTouchKeyboardEnabled(enabled); 122 keyboard::SetTouchKeyboardEnabled(enabled);
117 if (enabled) { 123 if (enabled) {
118 Shell::GetInstance()->CreateKeyboard(); 124 Shell::GetInstance()->CreateKeyboard();
119 } else { 125 } else {
120 if (!keyboard::IsKeyboardEnabled()) 126 if (!keyboard::IsKeyboardEnabled())
121 Shell::GetInstance()->DeactivateKeyboard(); 127 Shell::GetInstance()->DeactivateKeyboard();
122 } 128 }
123 } 129 }
124 130
125 } // namespace ash 131 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698