Remove usages of RootView from View by moving relevant RootView API methods t...

views/widget/root_view.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 "views/widget/root_view.h"
 
 #include <algorithm>
 
 #if defined(TOUCH_UI) && defined(HAVE_XINPUT2)
 #include <gdk/gdkx.h>
@@ skipping 101 matching lines @@
       last_mouse_event_x_(-1),
       last_mouse_event_y_(-1),
 #if defined(TOUCH_UI)
       gesture_manager_(GestureManager::GetInstance()),
       touch_pressed_handler_(NULL),
 #endif
       ALLOW_THIS_IN_INITIALIZER_LIST(focus_search_(this, false, false)),
       focus_on_mouse_pressed_(false),
       ignore_set_focus_calls_(false),
       focus_traversable_parent_(NULL),
-      focus_traversable_parent_view_(NULL),
-      drag_view_(NULL) {
+      focus_traversable_parent_view_(NULL) {
 }
 
 RootView::~RootView() {
   // If we have children remove them explicitly so to make sure a remove
   // notification is sent for each one of them.
   if (has_children())
     RemoveAllChildViews(true);
 
   if (pending_paint_task_)
     pending_paint_task_->Cancel();  // Ensure we're not called any more.
@@ skipping 73 matching lines @@
   if (mouse_move_handler_ != NULL) {
     MouseEvent exited_event(ui::ET_MOUSE_EXITED, 0, 0, 0);
     mouse_move_handler_->OnMouseExited(exited_event);
     mouse_move_handler_ = NULL;
   }
 }
 
 bool RootView::ProcessKeyEvent(const KeyEvent& event) {
   bool consumed = false;
 
-  View* v = GetFocusedView();
+  View* v = GetFocusManager()->GetFocusedView();
   // Special case to handle right-click context menus triggered by the
   // keyboard.
   if (v && v->IsEnabled() && ((event.key_code() == ui::VKEY_APPS) ||
      (event.key_code() == ui::VKEY_F10 && event.IsShiftDown()))) {
     v->ShowContextMenu(v->GetKeyboardContextMenuLocation(), false);
     return true;
   }
   for (; v && v != this && !consumed; v = v->parent()) {
     consumed = (event.type() == ui::ET_KEY_PRESSED) ?
         v->OnKeyPressed(event) : v->OnKeyReleased(event);
   }
 
   if (!consumed && default_keyboard_handler_) {
     consumed = (event.type() == ui::ET_KEY_PRESSED) ?
         default_keyboard_handler_->OnKeyPressed(event) :
         default_keyboard_handler_->OnKeyReleased(event);
   }
 
   return consumed;
 }
 
 void RootView::SetDefaultKeyboardHandler(View* v) {
   default_keyboard_handler_ = v;
 }
 
 bool RootView::ProcessMouseWheelEvent(const MouseWheelEvent& e) {
   View* v;
   bool consumed = false;
-  if (GetFocusedView()) {
-    for (v = GetFocusedView(); v && v != this && !consumed; v = v->parent())
+  View* focused_view = GetFocusManager()->GetFocusedView();
+  if (focused_view) {
+    for (v = focused_view; v && v != this && !consumed; v = v->parent())
       consumed = v->OnMouseWheel(e);
   }
 
   if (!consumed && default_keyboard_handler_) {
     consumed = default_keyboard_handler_->OnMouseWheel(e);
   }
   return consumed;
 }
 
 // Focus -----------------------------------------------------------------------
 
-void RootView::FocusView(View* view) {
-  if (view != GetFocusedView()) {
-    FocusManager* focus_manager = GetFocusManager();
-    // TODO(jcampan): This fails under WidgetGtk with TYPE_CHILD.
-    // (see http://crbug.com/21335) Reenable DCHECK and
-    // verify GetFocusManager works as expecte.
-#if defined(OS_WIN)
-    DCHECK(focus_manager) << "No Focus Manager for Window " <<
-        (GetWidget() ? GetWidget()->GetNativeView() : 0);
-#endif
-    if (!focus_manager)
-      return;
-    focus_manager->SetFocusedView(view);
-  }
-}
-
-View* RootView::GetFocusedView() {
-  FocusManager* focus_manager = GetFocusManager();
-  if (!focus_manager) {
-    // We may not have a FocusManager when the window that contains us is being
-    // deleted. Sadly we cannot wait for the window to be destroyed before we
-    // remove the FocusManager (see xp_frame.cc for more info).
-    return NULL;
-  }
-
-  // Make sure the focused view belongs to this RootView's view hierarchy.
-  View* view = focus_manager->GetFocusedView();
-  if (view && (view->GetRootView() == this))
-    return view;
-
-#if defined(OS_LINUX)
-  if (view && NativeTextfieldViews::IsTextfieldViewsEnabled()) {
-    // hack to deal with two root views.
-    // should be fixed by eliminating one of them
-    return view;
-  }
-#endif
-  return NULL;
-}
-
 void RootView::SetFocusOnMousePressed(bool f) {
   focus_on_mouse_pressed_ = f;
 }
 
 void RootView::SetFocusTraversableParent(FocusTraversable* focus_traversable) {
   DCHECK(focus_traversable != this);
   focus_traversable_parent_ = focus_traversable;
 }
 
 void RootView::SetFocusTraversableParentView(View* view) {
@@ skipping 345 matching lines @@
 
 std::string RootView::GetClassName() const {
   return kViewClassName;
 }
 
 AccessibilityTypes::Role RootView::GetAccessibleRole() {
   return AccessibilityTypes::ROLE_APPLICATION;
 }
 
 void RootView::ViewHierarchyChanged(bool is_add, View* parent, View* child) {
+  widget_->ViewHierarchyChanged(is_add, parent, child);
+
   if (!is_add) {
-    if (!explicit_mouse_handler_ && mouse_pressed_handler_ == child) {
+    if (!explicit_mouse_handler_ && mouse_pressed_handler_ == child)
       mouse_pressed_handler_ = NULL;
-    }
-
-    if (widget_)
-      widget_->ViewHierarchyChanged(is_add, parent, child);
-
-    if (mouse_move_handler_ == child) {
+    if (mouse_move_handler_ == child)
       mouse_move_handler_ = NULL;
-    }
-
-    if (GetFocusedView() == child) {
-      FocusView(NULL);
-    }
-
-    if (child == drag_view_)
-      drag_view_ = NULL;
-
-    if (default_keyboard_handler_ == child) {
+    if (default_keyboard_handler_ == child)
       default_keyboard_handler_ = NULL;
-    }
-
 #if defined(TOUCH_UI)
-    if (touch_pressed_handler_) {
+    if (touch_pressed_handler_)
       touch_pressed_handler_ = NULL;
-    }
 #endif
-
-    FocusManager* focus_manager = widget_->GetFocusManager();
-    // An unparanted RootView does not have a FocusManager.
-    if (focus_manager)
-      focus_manager->ViewRemoved(parent, child);
-
-    ViewStorage::GetInstance()->ViewRemoved(parent, child);
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // RootView, protected:
 
 // Coordinate conversion -------------------------------------------------------
 
 bool RootView::ConvertPointToMouseHandler(const gfx::Point& l,
                                           gfx::Point* p) {
@@ skipping 57 matching lines @@
   gdk_window_set_cursor(native_view->window, cursor);
 #endif
 }
 
 void RootView::SetMouseLocationAndFlags(const MouseEvent& e) {
   last_mouse_event_flags_ = e.flags();
   last_mouse_event_x_ = e.x();
   last_mouse_event_y_ = e.y();
 }
 
-// Drag and drop ---------------------------------------------------------------
-
-View* RootView::GetDragView() {
-  return drag_view_;
-}
-
 }  // namespace views