Reverting 18872.

views/widget/root_view.cc

 // Copyright (c) 2006-2008 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>
 
 #include "app/drag_drop_types.h"
 #include "app/gfx/canvas.h"
@@ skipping 28 matching lines @@
   }
 
   void Run() {
     if (root_view_)
       root_view_->PaintNow();
   }
  private:
   // The target root view.
   RootView* root_view_;
 
-  DISALLOW_COPY_AND_ASSIGN(PaintTask);
+  DISALLOW_EVIL_CONSTRUCTORS(PaintTask);
 };
 
 const char RootView::kViewClassName[] = "views/RootView";
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // RootView - constructors, destructors, initialization
 //
 /////////////////////////////////////////////////////////////////////////////
 
@@ skipping 195 matching lines @@
       FocusView(NULL);
     }
 
     if (child == drag_view_)
       drag_view_ = NULL;
 
     if (default_keyboard_handler_ == child) {
       default_keyboard_handler_ = NULL;
     }
 
-    FocusManager* focus_manager = widget_->GetFocusManager();
-    // An unparanted RootView does not have a FocusManager.
-    if (focus_manager)
+    // For a given widget hierarchy, focus is tracked by a FocusManager attached
+    // to our nearest enclosing Window. <-- Important Assumption!
+    // We may not have access to our window if this function is called as a
+    // result of teardown during the deletion of the RootView and its hierarchy,
+    // so we don't bother notifying the FocusManager in that case because it
+    // will have already been destroyed (the Widget that contains us is
+    // NCDESTROY'ed which in turn destroys the focus manager _before_ the
+    // RootView is deleted.)
+#if defined(OS_WIN)
+    Window* window = GetWindow();
+    if (window) {
+      FocusManager* focus_manager =
+          FocusManager::GetFocusManager(window->GetNativeWindow());
       focus_manager->ViewRemoved(parent, child);
+    }
     ViewStorage::GetSharedInstance()->ViewRemoved(parent, child);
+#endif
   }
 }
 
 void RootView::SetFocusOnMousePressed(bool f) {
   focus_on_mouse_pressed_ = f;
 }
 
 bool RootView::OnMousePressed(const MouseEvent& e) {
   // This function does not normally handle non-client messages except for
   // non-client double-clicks. Actually, all double-clicks are special as the
@@ skipping 222 matching lines @@
 void RootView::OnWidgetDestroyed() {
 #if defined(OS_WIN)
   if (drop_target_.get()) {
     RevokeDragDrop(GetWidget()->GetNativeView());
     drop_target_ = NULL;
   }
 #else
   // TODO(port): Port RootViewDropTarget and this goes away.
   NOTIMPLEMENTED();
 #endif
+  widget_ = NULL;
 }
 
 void RootView::ProcessMouseDragCanceled() {
   if (mouse_pressed_handler_) {
     // Synthesize a release event.
     MouseEvent release_event(Event::ET_MOUSE_RELEASED, last_mouse_event_x_,
                              last_mouse_event_y_, last_mouse_event_flags_);
     OnMouseReleased(release_event, true);
   }
 }
@@ skipping 417 matching lines @@
     previous_cursor_ = NULL;
   }
 #elif defined(OS_LINUX)
   gdk_window_set_cursor(GetWidget()->GetNativeView()->window, cursor);
   if (cursor)
     gdk_cursor_destroy(cursor);
 #endif
 }
 
 }  // namespace views