diff options
| author | bshe <bshe@chromium.org> | 2014-09-22 16:16:52 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-22 23:17:05 +0000 |
| commit | eaae09a093fc4c3d4ac8ba0f36e367e8a3dc7378 (patch) | |
| tree | f73cd7542e583df4201d33ace2b5e05e5c85c78e /ash/shell.h | |
| parent | beec6a363b7ec3751a83566beaa6f8565e709bad (diff) | |
| download | chromium_src-eaae09a093fc4c3d4ac8ba0f36e367e8a3dc7378.zip chromium_src-eaae09a093fc4c3d4ac8ba0f36e367e8a3dc7378.tar.gz chromium_src-eaae09a093fc4c3d4ac8ba0f36e367e8a3dc7378.tar.bz2 | |
Enable virtual keyboard in overview mode
Touch view uses virtual_keyboard_window_controller to enable/disable
virtual keyboard. However, virtual_keyboard_window_controller is specific
for a Touch Usability mode which nobody uses and is removed. This CL adds a
VirtualKeyboardObserver to replace virtual_keyboard_window_controller.
BUG=416495
Review URL: https://codereview.chromium.org/592753004
Cr-Commit-Position: refs/heads/master@{#296086}
Diffstat (limited to 'ash/shell.h')
| -rw-r--r-- | ash/shell.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ash/shell.h b/ash/shell.h index 7d5ab3b..a807c6b 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -141,6 +141,7 @@ class TouchTransformerController; class TouchObserverHUD; class UserActivityDetector; class UserWallpaperDelegate; +class VirtualKeyboardController; class VideoActivityNotifier; class VideoDetector; class WebNotificationTray; @@ -666,6 +667,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate, scoped_ptr<WindowSelectorController> window_selector_controller_; scoped_ptr<FocusCycler> focus_cycler_; scoped_ptr<DisplayController> display_controller_; + scoped_ptr<VirtualKeyboardController> virtual_keyboard_controller_; scoped_ptr<HighContrastController> high_contrast_controller_; scoped_ptr<MagnificationController> magnification_controller_; scoped_ptr<PartialMagnificationController> partial_magnification_controller_; |