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

Unified Diff: ash/shell.h

Issue 613343005: Automatic deployment of the virtual keyboard. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix typo. Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/ash.gyp ('k') | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index ea2382cb2233488889fb9e4d1c174f540d3e7aa4..91b8405a507b828dac4b1321bb96773f8393f194 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -667,7 +667,6 @@ 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_;
@@ -720,6 +719,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
scoped_ptr<LogoutConfirmationController> logout_confirmation_controller_;
scoped_ptr<LastWindowClosedLogoutReminder>
last_window_closed_logout_reminder_;
+ scoped_ptr<VirtualKeyboardController> virtual_keyboard_controller_;
// Controls video output device state.
scoped_ptr<ui::DisplayConfigurator> display_configurator_;
scoped_ptr<DisplayConfiguratorAnimation> display_configurator_animation_;
« no previous file with comments | « ash/ash.gyp ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698