| Index: ash/root_window_controller.h
|
| diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h
|
| index d10c6b179bc8575bc0361c05fa71c5e2ff72faa4..294b7866e8bcbad32ae917f8b37d8b358a382acb 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;
|
| @@ -166,11 +170,16 @@ class ASH_EXPORT RootWindowController {
|
| // types in the shell UI.
|
| void CreateContainersInRootWindow(aura::RootWindow* root_window);
|
|
|
| + // Initializes the virtual keyboard, placing it in |parent|.
|
| + void InitKeyboard(aura::Window* parent);
|
| +
|
| 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_;
|
|
|
|
|