| 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_;
|
|
|