More surgery to remove views 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 35 matching lines @@
 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.
 gfx::Rect GetKeyboardPosition(int height) {
-  views::View* desktop = views::desktop::DesktopWindowView::desktop_window_view;
-  gfx::Rect area;
-  if (desktop)
-    area = desktop->bounds();
-  else
-    area = gfx::Screen::GetMonitorAreaNearestPoint(gfx::Point());
+  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,
@@ skipping 440 matching lines @@
 }
 
 void KeyboardWidget::OnWidgetActivationChanged(Widget* widget, bool active) {
   if (target_ == widget && !active)
     SetTarget(NULL);
 }
 
 VirtualKeyboardManager::VirtualKeyboardManager()
     : keyboard_(new KeyboardWidget()) {
   keyboard_->AddObserver(this);
-
-  views::desktop::DesktopWindowView* desktop =
-      views::desktop::DesktopWindowView::desktop_window_view;
-
-  // We are either not in views desktop mode, or we are and we are not yet
-  // observing the desktop.
-  DCHECK(!desktop || !desktop->HasObserver(this));
-
-  if (desktop)
-    desktop->AddObserver(this);
 }
 
 VirtualKeyboardManager::~VirtualKeyboardManager() {
   DCHECK(!keyboard_);
-
-  views::desktop::DesktopWindowView* desktop =
-      views::desktop::DesktopWindowView::desktop_window_view;
-
-  // We are either not in views desktop mode, or we are and we have been
-  // observing the desktop
-  DCHECK(!desktop || desktop->HasObserver(this));
-
-  if (desktop)
-    desktop->RemoveObserver(this);
 }
 
 void VirtualKeyboardManager::ShowKeyboardForWidget(views::Widget* widget) {
   keyboard_->ShowKeyboardForWidget(widget);
 }
 
 void VirtualKeyboardManager::Hide() {
   keyboard_->Hide();
 }
 
 views::Widget* VirtualKeyboardManager::keyboard() {
   return keyboard_;
 }
 
 void VirtualKeyboardManager::OnWidgetClosing(views::Widget* widget) {
   DCHECK_EQ(keyboard_, widget);
   keyboard_ = NULL;
 }
 
-void VirtualKeyboardManager::OnDesktopBoundsChanged(
-    const gfx::Rect& prev_bounds) {
-  keyboard_->ResetBounds();
-}
-
 // static
 VirtualKeyboardManager* VirtualKeyboardManager::GetInstance() {
   return Singleton<VirtualKeyboardManager>::get();
 }