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

Unified Diff: ash/virtual_keyboard_controller.h

Issue 2445293002: Make the virtual keyboard show up on the display with input focus. (Closed)
Patch Set: fix one more compilation error on Windows Created 4 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shell.cc ('k') | ash/virtual_keyboard_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/virtual_keyboard_controller.h
diff --git a/ash/virtual_keyboard_controller.h b/ash/virtual_keyboard_controller.h
index fc8d4872e5b4a47a1bc4cd87424b41c289e32814..d590f197db4aacad1843d352a1ffd3acf9e8d292 100644
--- a/ash/virtual_keyboard_controller.h
+++ b/ash/virtual_keyboard_controller.h
@@ -5,17 +5,21 @@
#ifndef ASH_VIRTUAL_KEYBOARD_CONTROLLER_H_
#define ASH_VIRTUAL_KEYBOARD_CONTROLLER_H_
+#include <stdint.h>
+
#include "ash/ash_export.h"
#include "ash/common/shell_observer.h"
#include "base/macros.h"
#include "ui/events/devices/input_device_event_observer.h"
+#include "ui/keyboard/keyboard_layout_delegate.h"
namespace ash {
// This class observes input device changes for the virtual keyboard.
class ASH_EXPORT VirtualKeyboardController
: public ShellObserver,
- public ui::InputDeviceEventObserver {
+ public ui::InputDeviceEventObserver,
+ public keyboard::KeyboardLayoutDelegate {
public:
VirtualKeyboardController();
~VirtualKeyboardController() override;
@@ -33,6 +37,10 @@ class ASH_EXPORT VirtualKeyboardController
// when determining whether or not to show the on-screen keyboard.
void ToggleIgnoreExternalKeyboard();
+ // keyboard::KeyboardLayoutDelegate
+ void MoveKeyboardToDisplay(int64_t display_id) override;
+ void MoveKeyboardToTouchableDisplay() override;
+
private:
// Updates the list of active input devices.
void UpdateDevices();
« no previous file with comments | « ash/shell.cc ('k') | ash/virtual_keyboard_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698