Rename Desktop->RootWindow.

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 "ui/views/ime/text_input_type_tracker.h"
 #include "ui/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/desktop_observer.h"
+#include "ui/aura/root_window.h"
+#include "ui/aura/root_window_observer.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.virtualKeyboard.onTextInputTypeChanged";
 
 // The default position of the keyboard widget should be at the bottom,
-// spanning the entire width of the desktop.
+// spanning the entire width of the root window.
 gfx::Rect GetKeyboardPosition(int height) {
   gfx::Rect area = gfx::Screen::GetMonitorAreaNearestPoint(gfx::Point());
   return gfx::Rect(area.x(), area.y() + area.height() - height,
                    area.width(), height);
 }
 
 }  // namespace
 
 // 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::DesktopObserver,
+      public aura::RootWindowObserver,
 #endif
       public content::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);
 
-  // Updates the bounds to reflect the current screen/desktop bounds.
+  // Updates the bounds to reflect the current screen/root window bounds.
   void ResetBounds();
 
   // Overridden from views::Widget
   void Hide() OVERRIDE;
 
  private:
   // Sets the target widget, adds/removes Widget::Observer, reparents etc.
   void SetTarget(Widget* target);
 
   // Returns the widget of the active browser, or NULL if there is no such
@@ skipping 26 matching lines @@
 
 #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::DesktopObserver.
-  virtual void OnDesktopResized(const gfx::Size& new_size) OVERRIDE;
+  // Overridden from aura::RootWindowObserver.
+  virtual void OnRootWindowResized(const gfx::Size& new_size) OVERRIDE;
 #endif
 
   // Overridden from NotificationObserver.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Overridden from views::Widget::Observer.
   virtual void OnWidgetClosing(Widget* widget) OVERRIDE;
   virtual void OnWidgetVisibilityChanged(Widget* widget, bool visible) OVERRIDE;
@@ skipping 74 matching lines @@
                  content::NOTIFICATION_APP_TERMINATING,
                  content::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);
+  aura::RootWindow::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);
+  aura::RootWindow::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(
@@ skipping 179 matching lines @@
     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) {
+void KeyboardWidget::OnRootWindowResized(const gfx::Size& new_size) {
   ResetBounds();
 }
 #endif
 
 void KeyboardWidget::Observe(int type,
                              const content::NotificationSource& source,
                              const content::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
@@ skipping 80 matching lines @@
 
 void VirtualKeyboardManager::OnWidgetClosing(views::Widget* widget) {
   DCHECK_EQ(keyboard_, widget);
   keyboard_ = NULL;
 }
 
 // static
 VirtualKeyboardManager* VirtualKeyboardManager::GetInstance() {
   return Singleton<VirtualKeyboardManager>::get();
 }