| Index: ash/root_window_controller.h
|
| diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h
|
| index ea3f316e4da85cdb325db045ad12168f02209de5..1bd6ae8ca0610c05cc1da4f7c449faef7ac90fd0 100644
|
| --- a/ash/root_window_controller.h
|
| +++ b/ash/root_window_controller.h
|
| @@ -30,6 +30,10 @@ class RootWindowEventFilter;
|
| }
|
| }
|
|
|
| +namespace keyboard {
|
| +class KeyboardController;
|
| +}
|
| +
|
| namespace ash {
|
| class StackingController;
|
| class ShelfWidget;
|
| @@ -174,11 +178,16 @@ class ASH_EXPORT RootWindowController {
|
| // types in the shell UI.
|
| void CreateContainersInRootWindow(aura::RootWindow* root_window);
|
|
|
| + // Initializes the virtual keyboard.
|
| + void InitKeyboard();
|
| +
|
| scoped_ptr<aura::RootWindow> root_window_;
|
| RootWindowLayoutManager* root_window_layout_;
|
|
|
| scoped_ptr<StackingController> stacking_controller_;
|
|
|
| + scoped_ptr<keyboard::KeyboardController> keyboard_controller_;
|
| +
|
| // The shelf for managing the launcher and the status widget.
|
| scoped_ptr<ShelfWidget> shelf_;
|
|
|
|
|