Index: ash/root_window_controller.h |
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h |
index 49ce6b89f89ab2d10e90b6fb5f1c2c68a7e9bda2..7820434508fa5e46559e0383a493d0a429b62d3d 100644 |
--- a/ash/root_window_controller.h |
+++ b/ash/root_window_controller.h |
@@ -102,10 +102,6 @@ class ASH_EXPORT RootWindowController : public ShellObserver { |
return always_on_top_controller_.get(); |
} |
- keyboard::KeyboardController* keyboard_controller() { |
- return keyboard_controller_.get(); |
- } |
- |
ScreenDimmer* screen_dimmer() { return screen_dimmer_.get(); } |
// Access the shelf associated with this root window controller, |
@@ -214,6 +210,12 @@ class ASH_EXPORT RootWindowController : public ShellObserver { |
// windows are in fullscreen state, the topmost one is preferred. |
const aura::Window* GetTopmostFullscreenWindow() const; |
+ // Activate virtual keyboard on current root window controller. |
+ void ActivateKeyboard(keyboard::KeyboardController* keyboard_controller); |
+ |
+ // Deactivate virtual keyboard on current root window controller. |
+ void DeactivateKeyboard(keyboard::KeyboardController* keyboard_controller); |
+ |
private: |
void InitLayoutManagers(); |
@@ -225,9 +227,6 @@ class ASH_EXPORT RootWindowController : public ShellObserver { |
// types in the shell UI. |
void CreateContainersInRootWindow(aura::RootWindow* root_window); |
- // Initializes the virtual keyboard. |
- void InitKeyboard(); |
- |
// Enables projection touch HUD. |
void EnableTouchHudProjection(); |
@@ -243,8 +242,6 @@ class ASH_EXPORT RootWindowController : public ShellObserver { |
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_; |