| 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 88db57d7b012a445ccdea5f915d866bed3314e90..def3c06fc99814944a0f206134a41d397e74a28f 100644
|
| --- a/ash/display/virtual_keyboard_window_controller.h
|
| +++ b/ash/display/virtual_keyboard_window_controller.h
|
| @@ -9,16 +9,8 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/scoped_ptr.h"
|
|
|
| -namespace keyboard {
|
| -class KeyboardController;
|
| -}
|
| -
|
| namespace ash {
|
|
|
| -namespace test {
|
| -class VirtualKeyboardWindowControllerTest;
|
| -} // namespace test
|
| -
|
| namespace internal {
|
| class DisplayInfo;
|
| class RootWindowController;
|
| @@ -30,8 +22,6 @@ class ASH_EXPORT VirtualKeyboardWindowController {
|
| VirtualKeyboardWindowController();
|
| virtual ~VirtualKeyboardWindowController();
|
|
|
| - void ActivateKeyboard(keyboard::KeyboardController* keyboard_controller);
|
| -
|
| // Updates the root window's bounds using |display_info|.
|
| // Creates the new root window if one doesn't exist.
|
| void UpdateWindow(const DisplayInfo& display_info);
|
| @@ -40,12 +30,6 @@ class ASH_EXPORT VirtualKeyboardWindowController {
|
| void Close();
|
|
|
| private:
|
| - friend class test::VirtualKeyboardWindowControllerTest;
|
| -
|
| - RootWindowController* root_window_controller_for_test() {
|
| - return root_window_controller_.get();
|
| - }
|
| -
|
| scoped_ptr<RootWindowController> root_window_controller_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardWindowController);
|
|
|