| Index: ash/wm/panels/panel_layout_manager.h
|
| diff --git a/ash/wm/panels/panel_layout_manager.h b/ash/wm/panels/panel_layout_manager.h
|
| index 150dd3237488beecca21ab7aa5ca2b3cc840a5ae..6fcc527406e08685541c3d5d8b9e33dffcb6e437 100644
|
| --- a/ash/wm/panels/panel_layout_manager.h
|
| +++ b/ash/wm/panels/panel_layout_manager.h
|
| @@ -17,10 +17,10 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| +#include "ui/aura/client/virtual_keyboard_observer.h"
|
| #include "ui/aura/layout_manager.h"
|
| #include "ui/aura/window_observer.h"
|
| #include "ui/keyboard/keyboard_controller.h"
|
| -#include "ui/keyboard/keyboard_controller_observer.h"
|
| #include "ui/wm/public/activation_change_observer.h"
|
|
|
| namespace aura {
|
| @@ -58,7 +58,7 @@ class ASH_EXPORT PanelLayoutManager
|
| public ShellObserver,
|
| public aura::WindowObserver,
|
| public aura::client::ActivationChangeObserver,
|
| - public keyboard::KeyboardControllerObserver,
|
| + public aura::client::VirtualKeyboardObserver,
|
| public DisplayController::Observer,
|
| public ShelfLayoutManagerObserver,
|
| public wm::WindowStateObserver {
|
| @@ -160,7 +160,7 @@ class ASH_EXPORT PanelLayoutManager
|
| // Update the callout arrows for all managed panels.
|
| void UpdateCallouts();
|
|
|
| - // Overridden from keyboard::KeyboardControllerObserver:
|
| + // Overridden from aura::client::VirtualKeyboardObserver:
|
| virtual void OnKeyboardBoundsChanging(
|
| const gfx::Rect& keyboard_bounds) OVERRIDE;
|
|
|
|
|