| Index: ash/display/virtual_keyboard_window_controller.h
|
| diff --git a/ash/display/virtual_keyboard_window_controller.h b/ash/display/virtual_keyboard_window_controller.h
|
| index 23dd40635761932207ae0f6547d09a53bab19127..d864a20404bac9775b8bf34806112f4aabe01040 100644
|
| --- a/ash/display/virtual_keyboard_window_controller.h
|
| +++ b/ash/display/virtual_keyboard_window_controller.h
|
| @@ -15,6 +15,10 @@ namespace keyboard {
|
| class KeyboardController;
|
| }
|
|
|
| +namespace ui {
|
| +class ContextFactory;
|
| +}
|
| +
|
| namespace ash {
|
| class DisplayInfo;
|
| class RootWindowController;
|
| @@ -27,7 +31,7 @@ class VirtualKeyboardWindowControllerTest;
|
| // virtual keyboard.
|
| class ASH_EXPORT VirtualKeyboardWindowController : public ShellObserver {
|
| public:
|
| - VirtualKeyboardWindowController();
|
| + explicit VirtualKeyboardWindowController(ui::ContextFactory* context_factory);
|
| virtual ~VirtualKeyboardWindowController();
|
|
|
| void ActivateKeyboard(keyboard::KeyboardController* keyboard_controller);
|
| @@ -53,6 +57,8 @@ class ASH_EXPORT VirtualKeyboardWindowController : public ShellObserver {
|
| return root_window_controller_.get();
|
| }
|
|
|
| + ui::ContextFactory* context_factory_;
|
| +
|
| scoped_ptr<RootWindowController> root_window_controller_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardWindowController);
|
|
|