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

views/widget/widget_impl.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/widget_impl.h"
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "views/focus/focus_manager.h"
+#include "views/focus/view_storage.h"
 #include "views/view.h"
 #include "views/widget/native_widget.h"
 #include "views/widget/root_view.h"
 
 namespace views {
 
 namespace {
 
 // TODO(beng): move to platform file
 int GetHorizontalDragThreshold() {
@@ skipping 26 matching lines @@
 // WidgetImpl, public:
 
 WidgetImpl::WidgetImpl(View* contents_view)
     : ALLOW_THIS_IN_INITIALIZER_LIST(
           native_widget_(NativeWidget::CreateNativeWidget(this))),
       ALLOW_THIS_IN_INITIALIZER_LIST(root_view_(new RootView(this))),
       contents_view_(contents_view),
       is_mouse_button_pressed_(false),
       last_mouse_event_was_move_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(close_widget_factory_(this)),
-      delete_on_destroy_(true) {
+      delete_on_destroy_(true),
+      dragged_view_(NULL) {
 }
 
 WidgetImpl::~WidgetImpl() {
 }
 
 void WidgetImpl::InitWithNativeViewParent(gfx::NativeView parent,
                                           const gfx::Rect& bounds) {
   native_widget_->InitWithNativeViewParent(parent, bounds);
 }
 
@@ skipping 291 matching lines @@
 void* WidgetImpl::GetNativeWindowProperty(const char* name) {
   return native_widget_->GetNativeWindowProperty(name);
 }
 
 ThemeProvider* WidgetImpl::GetDefaultThemeProvider() const {
   NOTIMPLEMENTED();
   return NULL;
 }
 
 void WidgetImpl::ViewHierarchyChanged(bool is_add, View* parent, View* child) {
-  NOTIMPLEMENTED();
+  if (!is_add) {
+    FocusManager* focus_manager = GetFocusManager();
+    if (focus_manager)
+      focus_manager->ViewRemoved(parent, child);
+    ViewStorage::GetInstance()->ViewRemoved(parent, child);

[sky, 2011/02/17 00:37:46]

Don't you need the:

if (child == dragged_view_)
  dragged_view_ = NULL
?

+  }
 }
 
 bool WidgetImpl::ContainsNativeView(gfx::NativeView native_view) {
   NOTIMPLEMENTED();
   return false;
 }
 
+void WidgetImpl::StartDragForViewFromMouseEvent(
+    View* view,
+    const OSExchangeData& data,
+    int operation) {
+  // NOTE: view may be NULL.
+  dragged_view_ = view;
+  native_widget_->RunShellDrag(data, operation);
+
+  // If the view is removed during the drag operation, drag_view_ is set to
+  // NULL.
+  if (view && dragged_view_ == view) {
+    dragged_view_ = NULL;
+    view->OnDragDone();
+  }
+}
+
+View* WidgetImpl::GetDraggedView() {
+  return dragged_view_;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // WidgetImpl, private:
 
 void WidgetImpl::CloseNow() {
   native_widget_->Close();
 }
 
 #if !defined(OS_WIN)
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 20 matching lines @@
 // static
 NativeWidget* NativeWidget::GetTopLevelNativeWidget(
     gfx::NativeView native_view) {
   return NULL;
 }
 
 #endif  // !defined(OS_WIN)
 
 }  // namespace views