| Index: ash/system/virtual_keyboard/virtual_keyboard_tray.h
|
| diff --git a/ash/system/virtual_keyboard/virtual_keyboard_tray.h b/ash/system/virtual_keyboard/virtual_keyboard_tray.h
|
| index c741a03945935223d5f16e05f76be41935dc8c3a..2ae272dd3ce51bd333542c70b1bc9632b6a918cd 100644
|
| --- a/ash/system/virtual_keyboard/virtual_keyboard_tray.h
|
| +++ b/ash/system/virtual_keyboard/virtual_keyboard_tray.h
|
| @@ -6,6 +6,7 @@
|
| #define ASH_SYSTEM_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_
|
|
|
| #include "ash/keyboard/keyboard_ui_observer.h"
|
| +#include "ash/shell_observer.h"
|
| #include "ash/system/tray/tray_background_view.h"
|
| #include "base/macros.h"
|
| #include "ui/keyboard/keyboard_controller_observer.h"
|
| @@ -19,7 +20,8 @@ namespace ash {
|
| // TODO(sky): make this visible on non-chromeos platforms.
|
| class VirtualKeyboardTray : public TrayBackgroundView,
|
| public KeyboardUIObserver,
|
| - public keyboard::KeyboardControllerObserver {
|
| + public keyboard::KeyboardControllerObserver,
|
| + public ShellObserver {
|
| public:
|
| explicit VirtualKeyboardTray(Shelf* shelf);
|
| ~VirtualKeyboardTray() override;
|
| @@ -37,6 +39,9 @@ class VirtualKeyboardTray : public TrayBackgroundView,
|
| void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override;
|
| void OnKeyboardClosed() override;
|
|
|
| + // ShellObserver:
|
| + void OnKeyboardControllerCreated() override;
|
| +
|
| private:
|
| void ObserveKeyboardController();
|
| void UnobserveKeyboardController();
|
|
|