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

views/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/view.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 518 matching lines @@
 void View::GetViewsWithGroup(int group_id, std::vector<View*>* out) {
   if (group_ == group_id)
     out->push_back(this);
 
   for (int i = 0, count = child_count(); i < count; ++i)
     GetChildViewAt(i)->GetViewsWithGroup(group_id, out);
 }
 
 View* View::GetSelectedViewForGroup(int group_id) {
   std::vector<View*> views;
-  GetRootView()->GetViewsWithGroup(group_id, &views);
+  GetWidget()->GetRootView()->GetViewsWithGroup(group_id, &views);
   if (views.size() > 0)
     return views[0];
   else
     return NULL;
 }
 
 // Coordinate conversion -------------------------------------------------------
 
 // static
 void View::ConvertPointToView(const View* src,
@@ skipping 239 matching lines @@
   }
 
   size_t index = iter - accelerators_->begin();
   accelerators_->erase(iter);
   if (index >= registered_accelerator_count_) {
     // The accelerator is not registered to FocusManager.
     return;
   }
   --registered_accelerator_count_;
 
-  RootView* root_view = GetRootView();
-  if (!root_view) {
-    // We are not part of a view hierarchy, so there is nothing to do as we
-    // removed ourselves from accelerators_, we won't be registered when added
-    // to one.
-    return;
-  }
-
-  // If accelerator_focus_manager_ is NULL then we did not registered
-  // accelerators so there is nothing to unregister.
-  if (accelerator_focus_manager_) {
+  // Providing we are attached to a Widget and registered with a focus manager,
+  // we should de-register from that focus manager now.
+  if (GetWidget() && accelerator_focus_manager_)
     accelerator_focus_manager_->UnregisterAccelerator(accelerator, this);
-  }
 }
 
 void View::ResetAccelerators() {
   if (accelerators_.get())
     UnregisterAccelerators(false);
 }
 
 // Focus -----------------------------------------------------------------------
 
 bool View::HasFocus() {
@@ skipping 32 matching lines @@
   return (focusable_ || accessibility_focusable_) && IsEnabled() &&
     IsVisibleInRootView();
 }
 
 FocusManager* View::GetFocusManager() {
   Widget* widget = GetWidget();
   return widget ? widget->GetFocusManager() : NULL;
 }
 
 void View::RequestFocus() {
-  RootView* rv = GetRootView();
-  if (rv && IsFocusableInRootView())
-    rv->FocusView(this);
+  FocusManager* focus_manager = GetFocusManager();
+  if (focus_manager && IsFocusableInRootView())
+    focus_manager->SetFocusedView(this);
 }
 
 void View::WillGainFocus() {
 }
 
 void View::DidGainFocus() {
 }
 
 void View::WillLoseFocus() {
 }
@@ skipping 53 matching lines @@
   return ui::DragDropTypes::DRAG_NONE;
 }
 
 void View::OnDragExited() {
 }
 
 int View::OnPerformDrop(const DropTargetEvent& event) {
   return ui::DragDropTypes::DRAG_NONE;
 }
 
+void View::OnDragDone() {
+}
+
 // static
 bool View::ExceededDragThreshold(int delta_x, int delta_y) {
   return (abs(delta_x) > GetHorizontalDragThreshold() ||
           abs(delta_y) > GetVerticalDragThreshold());
 }
 
 // Accessibility ---------------------------------------------------------------
 
 void View::NotifyAccessibilityEvent(AccessibilityTypes::Event event_type) {
   NotifyAccessibilityEvent(event_type, true);
@@ skipping 173 matching lines @@
   return drag_controller_ ?
       drag_controller_->GetDragOperations(this, press_pt) :
       ui::DragDropTypes::DRAG_NONE;
 }
 
 void View::WriteDragData(const gfx::Point& press_pt, OSExchangeData* data) {
   DCHECK(drag_controller_);
   drag_controller_->WriteDragData(this, press_pt, data);
 }
 
-void View::OnDragDone() {
-}
-
 bool View::InDrag() {
-  RootView* root_view = GetRootView();
-  return root_view ? (root_view->GetDragView() == this) : false;
+  Widget* widget = GetWidget();
+  return widget ? widget->GetDraggedView() == this : false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // View, private:
 
 // DropInfo --------------------------------------------------------------------
 
 void View::DragInfo::Reset() {
   possible_drag = false;
   start_pt = gfx::Point();
@@ skipping 305 matching lines @@
 
 // Accelerators ----------------------------------------------------------------
 
 void View::RegisterPendingAccelerators() {
   if (!accelerators_.get() ||
       registered_accelerator_count_ == accelerators_->size()) {
     // No accelerators are waiting for registration.
     return;
   }
 
-  RootView* root_view = GetRootView();
-  if (!root_view) {
-    // We are not yet part of a view hierarchy, we'll register ourselves once
-    // added to one.
+  if (!GetWidget()) {
+    // The view is not yet attached to a widget, defer registration until then.
     return;
   }
 
   accelerator_focus_manager_ = GetFocusManager();
   if (!accelerator_focus_manager_) {
     // Some crash reports seem to show that we may get cases where we have no
     // focus manager (see bug #1291225).  This should never be the case, just
     // making sure we don't crash.
 
     // TODO(jcampan): This fails for a view under WidgetGtk with TYPE_CHILD.
@@ skipping 12 matching lines @@
        iter != accelerators_->end(); ++iter) {
     accelerator_focus_manager_->RegisterAccelerator(*iter, this);
   }
   registered_accelerator_count_ = accelerators_->size();
 }
 
 void View::UnregisterAccelerators(bool leave_data_intact) {
   if (!accelerators_.get())
     return;
 
-  RootView* root_view = GetRootView();
-  if (root_view) {
+  if (GetWidget()) {
     if (accelerator_focus_manager_) {
       // We may not have a FocusManager if the window containing us is being
       // closed, in which case the FocusManager is being deleted so there is
       // nothing to unregister.
       accelerator_focus_manager_->UnregisterAccelerators(this);
       accelerator_focus_manager_ = NULL;
     }
     if (!leave_data_intact) {
       accelerators_->clear();
       accelerators_.reset();
@@ skipping 74 matching lines @@
 void View::DoDrag(const MouseEvent& e, const gfx::Point& press_pt) {
   int drag_operations = GetDragOperations(press_pt);
   if (drag_operations == ui::DragDropTypes::DRAG_NONE)
     return;
 
   OSExchangeData data;
   WriteDragData(press_pt, &data);
 
   // Message the RootView to do the drag and drop. That way if we're removed
   // the RootView can detect it and avoid calling us back.
-  RootView* root_view = GetRootView();
-  root_view->StartDragForViewFromMouseEvent(this, data, drag_operations);
+  GetWidget()->StartDragForViewFromMouseEvent(this, data, drag_operations);
 }
 
 }  // namespace views