aura: Some changes in Window and Desktop.

chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.h"
 
 #include "base/json/json_writer.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
@@ skipping 19 matching lines @@
 #include "ui/gfx/screen.h"
 #include "views/ime/text_input_type_tracker.h"
 #include "views/widget/widget.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/virtual_keyboard_selector.h"
 #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
 
 namespace {
 
 const int kDefaultKeyboardHeight = 300;
 const int kKeyboardSlideDuration = 300;  // In milliseconds
 const char kOnTextInputTypeChanged[] =
     "experimental.input.onTextInputTypeChanged";
@@ skipping 16 matching lines @@
 // TODO(sad): Is the default profile always going to be the one we want?
 
 class KeyboardWidget
     : public views::Widget,
       public ui::AnimationDelegate,
       public TabContentsObserver,
       public ExtensionFunctionDispatcher::Delegate,
 #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 {
  public:
   KeyboardWidget();
   virtual ~KeyboardWidget();
 
   // Show the keyboard for the target widget. The events from the keyboard will
   // be sent to |widget|.
   void ShowKeyboardForWidget(views::Widget* widget);
@@ skipping 33 matching lines @@
   virtual TabContents* GetAssociatedTabContents() const OVERRIDE;
 
 #if defined(OS_CHROMEOS)
   // Overridden from input_method::InputMethodManager::VirtualKeyboardObserver.
   virtual void VirtualKeyboardChanged(
       chromeos::input_method::InputMethodManager* manager,
       const chromeos::input_method::VirtualKeyboard& virtual_keyboard,
       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,
                        const NotificationDetails& details) OVERRIDE;
 
   // Overridden from views::Widget::Observer.
   virtual void OnWidgetClosing(Widget* widget) OVERRIDE;
   virtual void OnWidgetVisibilityChanged(Widget* widget, bool visible) OVERRIDE;
   virtual void OnWidgetActivationChanged(Widget* widget, bool active) OVERRIDE;
 
@@ skipping 67 matching lines @@
                  NotificationService::AllSources());
   registrar_.Add(this,
                  content::NOTIFICATION_APP_TERMINATING,
                  NotificationService::AllSources());
 
 #if defined(OS_CHROMEOS)
   chromeos::input_method::InputMethodManager* manager =
       chromeos::input_method::InputMethodManager::GetInstance();
   manager->AddVirtualKeyboardObserver(this);
 #endif
+
+#if defined(USE_AURA)
+  aura::Desktop::GetInstance()->AddObserver(this);
+#endif
 }
 
 KeyboardWidget::~KeyboardWidget() {
   if (target_)
     target_->RemoveObserver(this);
   views::TextInputTypeTracker::GetInstance()->RemoveTextInputTypeObserver(this);
 #if defined(OS_CHROMEOS)
   chromeos::input_method::InputMethodManager* manager =
       chromeos::input_method::InputMethodManager::GetInstance();
   manager->RemoveVirtualKeyboardObserver(this);
 #endif
 
+#if defined(USE_AURA)
+  aura::Desktop::GetInstance()->RemoveObserver(this);
+#endif
   // TODO(sad): Do anything else?
 }
 
 void KeyboardWidget::ShowKeyboardForWidget(views::Widget* widget) {
   if (target_ == widget && IsVisible() && !animation_->is_animating())
     return;
   SetTarget(widget);
 
   transform_.reset(new ui::InterpolatedTranslation(
       gfx::Point(0, keyboard_height_), gfx::Point()));
@@ skipping 164 matching lines @@
 void KeyboardWidget::VirtualKeyboardChanged(
     chromeos::input_method::InputMethodManager* manager,
     const chromeos::input_method::VirtualKeyboard& virtual_keyboard,
     const std::string& virtual_keyboard_layout) {
   const GURL& url = virtual_keyboard.GetURLForLayout(virtual_keyboard_layout);
   dom_view_->LoadURL(url);
   VLOG(1) << "VirtualKeyboardChanged: Switched to " << url.spec();
 }
 #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) {
   switch (type) {
     case chrome::NOTIFICATION_FOCUSED_EDITABLE_NODE_TOUCHED: {
       // In case the keyboard hid itself and the focus is still in an editable
       // field, and the user touches the field, then we want to show the
       // keyboard again.
       views::Widget* widget = GetBrowserWidget();
       if (widget)
@@ skipping 101 matching lines @@
 
 void VirtualKeyboardManager::OnDesktopBoundsChanged(
     const gfx::Rect& prev_bounds) {
   keyboard_->ResetBounds();
 }
 
 // static
 VirtualKeyboardManager* VirtualKeyboardManager::GetInstance() {
   return Singleton<VirtualKeyboardManager>::get();
 }