Index: ash/wm/dock/docked_window_layout_manager.h |
diff --git a/ash/wm/dock/docked_window_layout_manager.h b/ash/wm/dock/docked_window_layout_manager.h |
index 18569d8f8dbea57994484fdaa85643b34f63b5f6..a2da2e3b5c6b0ba9871902abd3e046bf290c6a5c 100644 |
--- a/ash/wm/dock/docked_window_layout_manager.h |
+++ b/ash/wm/dock/docked_window_layout_manager.h |
@@ -18,11 +18,11 @@ |
#include "base/memory/scoped_ptr.h" |
#include "base/observer_list.h" |
#include "base/time/time.h" |
+#include "ui/aura/client/virtual_keyboard_observer.h" |
#include "ui/aura/layout_manager.h" |
#include "ui/aura/window.h" |
#include "ui/aura/window_observer.h" |
#include "ui/gfx/rect.h" |
-#include "ui/keyboard/keyboard_controller_observer.h" |
#include "ui/wm/public/activation_change_observer.h" |
namespace aura { |
@@ -74,7 +74,7 @@ class ASH_EXPORT DockedWindowLayoutManager |
public ash::ShellObserver, |
public aura::WindowObserver, |
public aura::client::ActivationChangeObserver, |
- public keyboard::KeyboardControllerObserver, |
+ public aura::client::VirtualKeyboardObserver, |
public ShelfLayoutManagerObserver, |
public wm::WindowStateObserver { |
public: |
@@ -248,7 +248,7 @@ class ASH_EXPORT DockedWindowLayoutManager |
// changes or a window is moved). |
void UpdateStacking(aura::Window* active_window); |
- // keyboard::KeyboardControllerObserver: |
+ // aura::client::VirtualKeyboardObserver: |
virtual void OnKeyboardBoundsChanging( |
const gfx::Rect& keyboard_bounds) OVERRIDE; |