aura: Some changes in Window and Desktop.

chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc

Index: chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc
diff --git a/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc b/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc
index eb3e9afacdefbab30a60c8b6a8739e91439ca346..2a81d62c7ad25b01a2ae0dd53dad16fe6f753700 100644
--- a/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc
+++ b/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc
@@ -37,6 +37,7 @@
 #endif
 
 #if defined(USE_AURA)
+#include "ui/aura/desktop.h"
 #include "ui/aura_shell/shell.h"
 #include "ui/aura_shell/shell_window_ids.h"
 #endif
@@ -73,6 +74,9 @@ class KeyboardWidget
 #if defined(OS_CHROMEOS)
       public chromeos::input_method::InputMethodManager::VirtualKeyboardObserver,
 #endif
+#if defined(USE_AURA)
+      public aura::Desktop::Observer,
+#endif
       public NotificationObserver,
       public views::Widget::Observer,
       public views::TextInputTypeObserver {
@@ -126,6 +130,11 @@ class KeyboardWidget
       const std::string& virtual_keyboard_layout);
 #endif
 
+#if defined(USE_AURA)
+  // Overridden from aura::Desktop::Observer.
+  virtual void OnDesktopResized(const gfx::Size& new_size) OVERRIDE;
+#endif
+
   // Overridden from NotificationObserver.
   virtual void Observe(int type,
                        const NotificationSource& source,
@@ -213,6 +222,10 @@ KeyboardWidget::KeyboardWidget()
       chromeos::input_method::InputMethodManager::GetInstance();
   manager->AddVirtualKeyboardObserver(this);
 #endif
+
+#if defined(USE_AURA)
+  aura::Desktop::GetInstance()->AddObserver(this);
+#endif
 }
 
 KeyboardWidget::~KeyboardWidget() {
@@ -225,6 +238,9 @@ KeyboardWidget::~KeyboardWidget() {
   manager->RemoveVirtualKeyboardObserver(this);
 #endif
 
+#if defined(USE_AURA)
+  aura::Desktop::GetInstance()->RemoveObserver(this);
+#endif
   // TODO(sad): Do anything else?
 }
 
@@ -409,6 +425,12 @@ void KeyboardWidget::VirtualKeyboardChanged(
 }
 #endif
 
+#if defined(USE_AURA)
+void KeyboardWidget::OnDesktopResized(const gfx::Size& new_size) {
+  ResetBounds();
+}
+#endif
+
 void KeyboardWidget::Observe(int type,
                              const NotificationSource& source,
                              const NotificationDetails& details) {