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

Side by Side Diff: ash/virtual_keyboard_controller.cc

Issue 2889123003: Remove SetOverscrollEnabledWithAccessibilityKeyboard(). (Closed)
Patch Set: Created 3 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 | ui/keyboard/keyboard_util.h » ('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 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/keyboard/keyboard_ui.h" 9 #include "ash/keyboard/keyboard_ui.h"
10 #include "ash/root_window_controller.h" 10 #include "ash/root_window_controller.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 Shell::Get()->RemoveShellObserver(this); 78 Shell::Get()->RemoveShellObserver(this);
79 ui::InputDeviceManager::GetInstance()->RemoveObserver(this); 79 ui::InputDeviceManager::GetInstance()->RemoveObserver(this);
80 } 80 }
81 81
82 void VirtualKeyboardController::OnMaximizeModeStarted() { 82 void VirtualKeyboardController::OnMaximizeModeStarted() {
83 if (!IsSmartVirtualKeyboardEnabled()) { 83 if (!IsSmartVirtualKeyboardEnabled()) {
84 SetKeyboardEnabled(true); 84 SetKeyboardEnabled(true);
85 } else { 85 } else {
86 UpdateKeyboardEnabled(); 86 UpdateKeyboardEnabled();
87 } 87 }
88 keyboard::SetOverscrollEnabledWithAccessibilityKeyboard(true);
89 } 88 }
90 89
91 void VirtualKeyboardController::OnMaximizeModeEnded() { 90 void VirtualKeyboardController::OnMaximizeModeEnded() {
92 if (!IsSmartVirtualKeyboardEnabled()) { 91 if (!IsSmartVirtualKeyboardEnabled()) {
93 SetKeyboardEnabled(false); 92 SetKeyboardEnabled(false);
94 } else { 93 } else {
95 UpdateKeyboardEnabled(); 94 UpdateKeyboardEnabled();
96 } 95 }
97 keyboard::SetOverscrollEnabledWithAccessibilityKeyboard(false);
98 } 96 }
99 97
100 void VirtualKeyboardController::OnTouchscreenDeviceConfigurationChanged() { 98 void VirtualKeyboardController::OnTouchscreenDeviceConfigurationChanged() {
101 UpdateDevices(); 99 UpdateDevices();
102 } 100 }
103 101
104 void VirtualKeyboardController::OnKeyboardDeviceConfigurationChanged() { 102 void VirtualKeyboardController::OnKeyboardDeviceConfigurationChanged() {
105 UpdateDevices(); 103 UpdateDevices();
106 } 104 }
107 105
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 if (is_enabled == was_enabled) 205 if (is_enabled == was_enabled)
208 return; 206 return;
209 if (is_enabled) { 207 if (is_enabled) {
210 Shell::Get()->CreateKeyboard(); 208 Shell::Get()->CreateKeyboard();
211 } else { 209 } else {
212 Shell::Get()->DeactivateKeyboard(); 210 Shell::Get()->DeactivateKeyboard();
213 } 211 }
214 } 212 }
215 213
216 } // namespace ash 214 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ui/keyboard/keyboard_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698